From 9b773d0189f902aac544d183e9e4b920879ec6e7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Aug 2022 13:45:29 +0200 Subject: [PATCH 001/140] package/binutils: add version 2.39 Patch 0002-poison-system-directories.patch got rebased. Patch 0004+0005 is upstreamed and got removed. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- 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 | 4 + package/binutils/binutils.hash | 1 + 5 files changed, 401 insertions(+) create mode 100644 package/binutils/2.39/0001-sh-conf.patch create mode 100644 package/binutils/2.39/0002-poison-system-directories.patch create mode 100644 package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch diff --git a/package/binutils/2.39/0001-sh-conf.patch b/package/binutils/2.39/0001-sh-conf.patch new file mode 100644 index 0000000000..fcc597e4d9 --- /dev/null +++ b/package/binutils/2.39/0001-sh-conf.patch @@ -0,0 +1,48 @@ +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 new file mode 100644 index 0000000000..1d9447b5c2 --- /dev/null +++ b/package/binutils/2.39/0002-poison-system-directories.patch @@ -0,0 +1,298 @@ +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 new file mode 100644 index 0000000000..bfd531b818 --- /dev/null +++ b/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +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 9fa0cc4e8d..dec00d3e2e 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -21,6 +21,9 @@ config BR2_BINUTILS_VERSION_2_37_X config BR2_BINUTILS_VERSION_2_38_X bool "binutils 2.38" +config BR2_BINUTILS_VERSION_2_39_X + bool "binutils 2.39" + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc @@ -33,6 +36,7 @@ config BR2_BINUTILS_VERSION default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X + default "2.39" if BR2_BINUTILS_VERSION_2_39_X config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS string "Additional binutils options" diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index e98cb85275..7acf6fb52d 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,6 +2,7 @@ sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz +sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz From d08639e6b9e5b687c21c35041bb60a941fc7edb4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Aug 2022 13:46:54 +0200 Subject: [PATCH 002/140] package/binutils: remove 2.36.1 and make 2.38 default Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/binutils/2.36.1/0001-sh-conf.patch | 48 -- .../0002-poison-system-directories.patch | 306 ----------- ...ith-plt-link-failure-for-local-calls.patch | 59 --- ...elocation-R_OR1K_GOT_AHI16-for-gotha.patch | 256 --------- ...K_GOT16-overflow-failures-in-presenc.patch | 61 --- ...ge-plt_relocs-when-generating-plt-en.patch | 500 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 -- ...tive-relocation-against-dynamic-on-P.patch | 59 --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 --- ...OT32-relocations-against-ABS-symbols.patch | 53 -- package/binutils/Config.in.host | 6 +- package/binutils/binutils.hash | 1 - package/binutils/binutils.mk | 2 +- 13 files changed, 2 insertions(+), 1474 deletions(-) delete mode 100644 package/binutils/2.36.1/0001-sh-conf.patch delete mode 100644 package/binutils/2.36.1/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch delete mode 100644 package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch delete mode 100644 package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch delete mode 100644 package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch delete mode 100644 package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch delete mode 100644 package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch delete mode 100644 package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch delete mode 100644 package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch diff --git a/package/binutils/2.36.1/0001-sh-conf.patch b/package/binutils/2.36.1/0001-sh-conf.patch deleted file mode 100644 index 0070e582fa..0000000000 --- a/package/binutils/2.36.1/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f88f4c77266b9669b285ab64386cf39e183661bb 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 68779feb42b..8b4333b2c15 100755 ---- a/configure -+++ b/configure -@@ -3887,7 +3887,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 d16a2757689..035854759ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1177,7 +1177,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.29.2 - diff --git a/package/binutils/2.36.1/0002-poison-system-directories.patch b/package/binutils/2.36.1/0002-poison-system-directories.patch deleted file mode 100644 index 071b67ac7d..0000000000 --- a/package/binutils/2.36.1/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From a9652a60af6254d07066f08377415f05e3a9462e 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. - -[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 --git a/ld/config.in b/ld/config.in -index 7b60d778587..37b8e9b6f6c 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,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 a8d248eab58..f52e1f3c18f 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -828,6 +828,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1496,6 +1497,8 @@ Optional Features: - --disable-largefile omit support for large files - --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) -@@ -15841,7 +15844,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 c9c69ab9245..59dab0a6ac4 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,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 93f5af92c7d..ff7f71a7b66 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean 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 7a602b9c6ab..cccbfbab3bb 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2810,6 +2810,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. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 81cb86d51e2..cd5c2752679 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean 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 b0101028321..77f5accb5d9 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -161,6 +161,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, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 863df0293ea..f06f2546ef5 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -323,6 +323,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 f005a58a045..eb383d3755b 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -591,6 +591,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) -@@ -603,6 +611,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; -@@ -1633,6 +1642,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), -@@ -1778,6 +1795,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.29.2 - diff --git a/package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 85931ff661..0000000000 --- a/package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b5fdaa85790dff45fd2c3fd15405c16dbc50a074 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 65938e51378..4f82cc4c667 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2566,11 +2566,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index 08c23d2760..0000000000 --- a/package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From 141dee7402871c7b3994838c3eddf64a92d67be7 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 7eff85b7eaa..e76b9e7a319 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5048,6 +5048,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4f82cc4c667..48461854a96 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1111,6 +1126,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1373,6 +1389,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1464,7 +1481,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1990,6 +2008,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index 7271a2ad5a1..e0ee2dafc07 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2757,6 +2757,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 4f4b95a0b7f..fe94e0d8f91 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6204,6 +6204,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index 7f281481061..69ab90584a2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 045ab6230b6..fdccf67f9e1 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 618072fb10..0000000000 --- a/package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From de914df5f2ba23a9f6f1fbf6efdc22e1b045901c Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 48461854a96..44e67f2b84b 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1278,6 +1278,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1485,6 +1486,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ relocation we assume the code is doing the right thing to avoid -+ overflows. Here we mask the lower 16-bit of the relocation to -+ avoid overflow validation failures. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index 6d50852fe9..0000000000 --- a/package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From 4a7b357d0c802685bee7706bafb9702c821286e1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 44e67f2b84b..3da68e52425 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -931,9 +937,20 @@ struct elf_or1k_link_hash_table - { - struct elf_link_hash_table root; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - ((is_elf_hash_table ((p)->hash) \ -@@ -2222,33 +2239,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2315,7 +2345,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2326,27 +2357,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2389,7 +2420,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2401,6 +2433,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2418,10 +2451,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2433,27 +2469,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2777,11 +2843,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2798,7 +2869,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 8bb943aacc9..f10949e89aa 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa..0000000000 --- a/package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 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.25.1 - diff --git a/package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af..0000000000 --- a/package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -2.25.1 - diff --git a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch deleted file mode 100644 index c4fedb719a..0000000000 --- a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 190091f9c1ec4cb80f8106e45ab4125eefa4114b Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 Jan 2022 09:03:28 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special - howto - -Previously when fixing PR 21464 we masked out upper bits of the -relocation value in order to avoid overflow complaints when acceptable. -It turns out this does not work when the relocation value ends up being -signed. - -To fix this this patch introduces a special howto with -complain_on_overflow set to complain_overflow_dont. This is used in -place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 -relocations. - -bfd/ChangeLog: - - PR 28735 - * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. - (or1k_elf_relocate_section): Use new howto instead of trying to - mask out relocation bits. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 431a8ee479f..ea26cdf1033 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = - FALSE), /* pcrel_offset */ - }; - -+/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 -+ relocations when we know we can ignore overflows. */ -+static reloc_howto_type or1k_elf_got16_no_overflow_howto = -+ HOWTO (R_OR1K_GOT16, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE); /* pcrel_offset */ -+ - /* Map BFD reloc types to Or1k ELF reloc types. */ - - struct or1k_reloc_map -@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, - if (r_type == R_OR1K_GOT_AHI16) - saw_gotha = TRUE; - -- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 - relocation we assume the code is doing the right thing to avoid -- overflows. Here we mask the lower 16-bit of the relocation to -- avoid overflow validation failures. */ -+ overflows. */ - if (r_type == R_OR1K_GOT16 && saw_gotha) -- relocation &= 0xffff; -+ howto = &or1k_elf_got16_no_overflow_howto; - - /* Addend should be zero. */ - if (rel->r_addend != 0) --- -2.25.1 - diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index af96f1a0f0..0000000000 --- a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -ld/ - - PR ld/28870 - * testsuite/ld-i386/i386.exp: Run pr28870. - * testsuite/ld-i386/pr28870.d: New file. - * testsuite/ld-i386/pr28870.s: Likewise. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index dec00d3e2e..907b63de13 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,14 +7,11 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_37_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_38_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_36_X - bool "binutils 2.36.1" - config BR2_BINUTILS_VERSION_2_37_X bool "binutils 2.37" @@ -33,7 +30,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X default "2.38" if BR2_BINUTILS_VERSION_2_38_X default "2.39" if BR2_BINUTILS_VERSION_2_39_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 7acf6fb52d..1a8574de92 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 6362cb1641..a3fece27dc 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-2020.09-release else -BINUTILS_VERSION = 2.37 +BINUTILS_VERSION = 2.38 endif endif # BINUTILS_VERSION From a09768a3c19347728e4f9ad079f3e5990032a9a6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 13 Aug 2022 03:54:22 -0600 Subject: [PATCH 003/140] package/meson: bump to version 0.63.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 1133bed046..d22b21cdea 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.63.0/meson-0.63.0.tar.gz.asc -sha256 3b51d451744c2bc71838524ec8d96cd4f8c4793d5b8d5d0d0a9c8a4f7c94cd6f meson-0.63.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.63.1/meson-0.63.1.tar.gz.asc +sha256 06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9 meson-0.63.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 880dfffcf1..1e431f426a 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.63.0 +MESON_VERSION = 0.63.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From 7ff21f8d4b94e859ce95aa24ad361f2c5df9e284 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Aug 2022 12:51:51 +0200 Subject: [PATCH 004/140] package/binutils: handle gprofng as an optional feature binutils 2.39 added support for gprofng, a new profiler (see https://www.phoronix.com/news/GNU-Profiler-gprofng). This new profiler is enabled by default, but it requires bison on the host. In order to handle this, this commit: - Adds a new option BR2_BINUTILS_GPROFNG, which allows to enable/disable gprofng in host-binutils - Unconditionnally disables gprofng for the target binutils, based on the idea that in a Buildroot context the analysis of profiling data is generally done on the host system. This can of course always be revisited later by adding a new option to the target binutils package. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/binutils/Config.in.host | 6 ++++++ package/binutils/binutils.mk | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 907b63de13..51802db043 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -34,6 +34,12 @@ config BR2_BINUTILS_VERSION default "2.38" if BR2_BINUTILS_VERSION_2_38_X default "2.39" if BR2_BINUTILS_VERSION_2_39_X +config BR2_BINUTILS_GPROFNG + bool "gprofng support" + depends on BR2_BINUTILS_VERSION_2_39_X + help + This option enables support for gprofng, a new profiler. + config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS string "Additional binutils options" default "" diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index a3fece27dc..e4cb19896d 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -52,6 +52,7 @@ BINUTILS_CONF_OPTS = \ --enable-install-libiberty \ --enable-build-warnings=no \ --with-system-zlib \ + --disable-gprofng \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) @@ -91,6 +92,13 @@ HOST_BINUTILS_CONF_OPTS = \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) +ifeq ($(BR2_BINUTILS_GPROFNG),y) +HOST_BINUTILS_DEPENDENCIES += host-bison +HOST_INBUTILS_CONF_OPTS += --enable-gprofng +else +HOST_INBUTILS_CONF_OPTS += --disable-gprofng +endif + # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) From d9fcbb28ef62e9a3bf947cad7443b46c056bac29 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 12 Aug 2022 10:07:49 +0200 Subject: [PATCH 005/140] package/dbus-broker: bump to release 32 The new releases mostly contain bug fixes. The build system has been prepared to use AppArmor library, but since actual support is still missing it is not worth yet to enable build infrastructure in Buildroot. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/dbus-broker/dbus-broker.hash | 16 +++++++++++++++- package/dbus-broker/dbus-broker.mk | 16 ++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index 26ebab7ac1..f6c2cbe160 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,3 +1,17 @@ # Locally calculated -sha256 4eca425db52b7ab1027153e93fea9b3f11759db9e93ffbf88759b73ddfb8026a dbus-broker-29.tar.xz +sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE +sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS +sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md +sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcini-1/AUTHORS +sha256 fc92d49d69aa9aa91919bac79242abee3eda27a567b4573ed3690b5cef0cf2fd subprojects/libcini-1/README.md +sha256 a30deb6dde90366bfaf054bc689a209b974f80c1cceac950c4378c14abaa243a subprojects/libclist-3/AUTHORS +sha256 75f4c76441ac69ba9474bb7ad0958389ca0f1f2fc90c5f7b033be3461652f5a6 subprojects/libclist-3/README.md +sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subprojects/libcrbtree-3/AUTHORS +sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md +sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS +sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md +sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS +sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS +sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index 22c5e8d8b7..9b8bf361b5 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 29 +DBUS_BROKER_VERSION = 32 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) @@ -15,13 +15,13 @@ DBUS_BROKER_LICENSE = \ # the AUTHORS and README, so keep both DBUS_BROKER_LICENSE_FILES = \ LICENSE \ - subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ - subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ - subprojects/c-list/AUTHORS subprojects/c-list/README.md \ - subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ - subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ - subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ - subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + subprojects/libcdvar-1/AUTHORS subprojects/libcdvar-1/README.md \ + subprojects/libcini-1/AUTHORS subprojects/libcini-1/README.md \ + subprojects/libclist-3/AUTHORS subprojects/libclist-3/README.md \ + subprojects/libcrbtree-3/AUTHORS subprojects/libcrbtree-3/README.md \ + subprojects/libcshquote-1/AUTHORS subprojects/libcshquote-1/README.md \ + subprojects/libcstdaux-1/AUTHORS subprojects/libcstdaux-1/README.md \ + subprojects/libcutf8-1/AUTHORS subprojects/libcutf8-1/README.md DBUS_BROKER_DEPENDENCIES = expat systemd DBUS_BROKER_CONF_OPTS = -Dlauncher=true From e992a3e7712f6f87fcbddb1844a5cbf51a1d82bb Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 12 Aug 2022 16:56:51 +0200 Subject: [PATCH 006/140] package/libgit2: link with -latomic if needed libgit2 is currently a library without any reverse dependencies so the missing atomic symbols do not cause build failures yet. libgit2 uses the atomics intrinsics on gcc >= 4.7 and the sync intrinsics on previous gcc versions. Since gcc 4.9 is the new minimum, ignore the sync intrinsics requirements. The next version of libgit2 will also build a binary, which will expose the problem. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/libgit2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 3f1e6e1593..9b5e2b897d 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -44,4 +44,9 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBGIT2_CONF_OPTS += \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) From 7c8e34f4d20598a6536a6d63b6c4a97eb3b794cf Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 12 Aug 2022 16:56:52 +0200 Subject: [PATCH 007/140] package/libgit2: bump to 1.5.0 It includes an option to build a command line program that can be used to replace git in simple cases. The upcoming sha256 repository support made them steal the sha256 code from RFC6234, hence the license change. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/Config.in | 10 ++++++++++ package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index a6a9728ff0..5d28f054f2 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -12,3 +12,13 @@ config BR2_PACKAGE_LIBGIT2 comment "libgit2 needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +if BR2_PACKAGE_LIBGIT2 + +config BR2_PACKAGE_LIBGIT2_CLI + bool "enable command line interface (git2_cli)" + help + Enable a command-line interface for libgit2. + It aims to be git-compatible. + +endif diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 3b5837f789..fb760fd4cc 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163 libgit2-1.4.3.tar.gz -sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING +sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9b5e2b897d..9409011eb4 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,9 +4,14 @@ # ################################################################################ -LIBGIT2_VERSION = 1.4.3 +LIBGIT2_VERSION = 1.5.0 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) +LIBGIT2_LICENSE = \ + GPL-2.0 with linking exception, \ + MIT (sha1), \ + BSD-3-Clause (sha256), \ + wildmatch license (wildmatch), \ + CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -44,8 +49,15 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_PACKAGE_LIBGIT2_CLI),y) +LIBGIT2_CONF_OPTS += -DBUILD_CLI=ON +else +LIBGIT2_CONF_OPTS += -DBUILD_CLI=OFF +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBGIT2_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ -DCMAKE_SHARED_LINKER_FLAGS=-latomic endif From 936334d8226c2a7b339974845fa3584a90f92b3d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 Aug 2022 14:55:34 +0200 Subject: [PATCH 008/140] package/gdk-pixbuf: bump to version 2.42.9 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf/gdk-pixbuf.hash | 4 ++-- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 4bb246aa50..35084a50ac 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,3 +1,3 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.sha256sum -sha256 84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6 gdk-pixbuf-2.42.8.tar.xz +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.sha256sum +sha256 28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962 gdk-pixbuf-2.42.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 57e8bbd511..7a75ed23f6 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.42 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).8 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).9 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPL-2.1+ From 87f0cca545140e1dcf38853d061476e6eb0b8f9a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 Aug 2022 14:55:50 +0200 Subject: [PATCH 009/140] package/libcap: bump to version 2.65 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 7c48cd950b..5fc8173905 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 c8465e1f0b068d5fc06199231135ccac7adb56d662b1de93589252e8cd071e13 libcap-2.64.tar.xz +sha256 73e350020cc31fe15360879d19384ffa3395a825f065fcf6bda3a5cdf965bebd libcap-2.65.tar.xz # Hash for license file: sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 91e02638e2..728a6ba6cc 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.64 +LIBCAP_VERSION = 2.65 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 83d5cd80a6a1d9fb22dc212cb25666dffb7d0ce4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 Aug 2022 14:56:01 +0200 Subject: [PATCH 010/140] package/nano: bump to version 6.4 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 8308005bbc..83de85b415 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/v6/nano-6.3.tar.xz.asc +# https://www.nano-editor.org/dist/v6/nano-6.4.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687 nano-6.3.tar.xz +sha256 4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0 nano-6.4.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index cad215bed2..ecfc37412d 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).3 +NANO_VERSION = $(NANO_VERSION_MAJOR).4 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 310a234596341ab333038cd9fb58567e077bb136 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 Aug 2022 14:56:12 +0200 Subject: [PATCH 011/140] package/nettle: bump to version 3.8.1 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/nettle/nettle.hash | 4 ++-- package/nettle/nettle.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nettle/nettle.hash b/package/nettle/nettle.hash index 14467977bf..d726cb94c6 100644 --- a/package/nettle/nettle.hash +++ b/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.8.tar.gz.sig -sha256 7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6 nettle-3.8.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.8.1.tar.gz.sig +sha256 364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe nettle-3.8.1.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 05b8b0bea5..dd4dfbbe38 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETTLE_VERSION = 3.8 +NETTLE_VERSION = 3.8.1 NETTLE_SITE = https://ftp.gnu.org/gnu/nettle NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES From cbddb02f8ae98770b9f8c067e54effdc5dc0ddaf Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 Aug 2022 14:56:21 +0200 Subject: [PATCH 012/140] package/pango: bump to version 1.50.9 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 9a73001c9f..48d7f4d5a3 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.8.sha256sum -sha256 cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa pango-1.50.8.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.9.sha256sum +sha256 1b636aabf905130d806372136f5e137b6a27f26d47defd9240bf444f6a4fe610 pango-1.50.9.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 30b1de9d23..348759092d 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).8 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).9 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From c8e3bfa2f5662160290dc97d6fb0b943cf894bec Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 Aug 2022 14:56:30 +0200 Subject: [PATCH 013/140] package/webp: bump to version 1.2.4 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index a95086e81c..969e4cd3d7 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz +sha256 7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df libwebp-1.2.4.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 670a7b8012..38a1564a63 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.2 +WEBP_VERSION = 1.2.4 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause From d4afac3ab11ea4b8c2d45312f70dadb63d17d628 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Aug 2022 17:13:57 +0200 Subject: [PATCH 014/140] package/binutils: fix typo in variable name Commit 7ff21f8d4b94 (package/binutils: handle gprofng as an optional feature) introduced the typo. Although it was noticed, the commit was not amended before being pushed... Fix that now... Signed-off-by: Yann E. MORIN --- package/binutils/binutils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index e4cb19896d..1ef7ee57d2 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -94,9 +94,9 @@ HOST_BINUTILS_CONF_OPTS = \ ifeq ($(BR2_BINUTILS_GPROFNG),y) HOST_BINUTILS_DEPENDENCIES += host-bison -HOST_INBUTILS_CONF_OPTS += --enable-gprofng +HOST_BINUTILS_CONF_OPTS += --enable-gprofng else -HOST_INBUTILS_CONF_OPTS += --disable-gprofng +HOST_BINUTILS_CONF_OPTS += --disable-gprofng endif # binutils run configure script of subdirs at make time, so ensure From f3b3887012de06c69b73291693c1bd4a35f21250 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Wed, 10 Aug 2022 04:06:51 -0700 Subject: [PATCH 015/140] package/ttyd: bump to version 1.7.0 Update hash for license file to account for an update in the (C) years. Signed-off-by: TIAN Yuanhao [yann.morin.1998@free.fr: update the license hash] Signed-off-by: Yann E. MORIN --- package/ttyd/ttyd.hash | 4 ++-- package/ttyd/ttyd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index c4263d6e94..283288febf 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9 ttyd-1.6.3.tar.gz -sha256 711762f081c180ade3d09d7b0b7537eaf35eca8d1671e47bc66eaa39376edb12 LICENSE +sha256 47bc98d43cf2060af06378a2113605b229c46895a391613bdaa5a1197bfe5d47 ttyd-1.7.0.tar.gz +sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index 856270a88d..7b582a696c 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.6.3 +TTYD_VERSION = 1.7.0 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE From a493f6288baf4d4ea71c2ce7b93e7dbe868f926e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Aug 2022 10:35:17 +0200 Subject: [PATCH 016/140] package/gdb: add support for version 12.1 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ++++++++++++++++ ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 +++++++++++++ package/gdb/12.1/0003-use-asm-sgidefs.h.patch | 40 ++++++++++++ .../0004-gdbserver-fix-build-for-m68k.patch | 63 +++++++++++++++++++ ...fork-inferior-include-linux-ptrace.h.patch | 53 ++++++++++++++++ ...getrandom-compile-for-uclibc-v1.0.35.patch | 39 ++++++++++++ .../12.1/0007-fix-musl-build-on-riscv.patch | 60 ++++++++++++++++++ ...-gdbserver-Makefile.in-fix-NLS-build.patch | 38 +++++++++++ package/gdb/Config.in | 1 + package/gdb/Config.in.host | 5 ++ package/gdb/gdb.hash | 1 + package/gdb/gdb.mk | 11 ++-- 12 files changed, 403 insertions(+), 6 deletions(-) create mode 100644 package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch create mode 100644 package/gdb/12.1/0003-use-asm-sgidefs.h.patch create mode 100644 package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch create mode 100644 package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch create mode 100644 package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch create mode 100644 package/gdb/12.1/0007-fix-musl-build-on-riscv.patch create mode 100644 package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 0000000000..8821bb497b --- /dev/null +++ b/package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From bca7617f325787550e2133fe082dbe4da7716fc6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index 1094f6b0be3..d8588a646c2 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index 08824887003..69afbae5359 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +-- +2.37.1 + diff --git a/package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 0000000000..74769b7c57 --- /dev/null +++ b/package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From a3b84f1777bd75bdc5914f4ce5f52c55e723cd9a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 3 Jun 2017 21:23:52 +0200 +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems + +Fixes a pt_{dsp,}regs redefinition when building with the musl C library +on SuperH. + +Inspired by +http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, +adapted for SuperH. + +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour +--- + gdbserver/linux-sh-low.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc +index 966bdeb8ba7..1e3ce53b4d5 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -76,7 +76,15 @@ extern const struct target_desc *tdesc_sh; + #include + #endif + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++# define pt_dspregs uapi_pt_dspregs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++# undef pt_dspregs ++#endif + + #define sh_num_regs 41 + +-- +2.37.1 + diff --git a/package/gdb/12.1/0003-use-asm-sgidefs.h.patch b/package/gdb/12.1/0003-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..637e4a29ee --- /dev/null +++ b/package/gdb/12.1/0003-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From 8c94bf2b40d51c500c364ac03a2da1e9f9a94287 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 20e12b6889e..1e66e98a013 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" +-- +2.37.1 + diff --git a/package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..435f705382 --- /dev/null +++ b/package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,63 @@ +From 48af20f76b468c5d274d286677a2887136c4c7c4 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdbserver/linux-m68k-low.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 7a433ffab5e..bb3fbd69bd7 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -17,6 +17,11 @@ + along with this program. If not, see . */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Linux target op definitions for the m68k architecture. */ +@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.37.1 + diff --git a/package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 0000000000..b1ecc2097c --- /dev/null +++ b/package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,53 @@ +From cbcb73a86dea0c0b9917b49b37095463155c5377 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index 4df9a98047e..9bf0f6059f5 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -27,6 +27,7 @@ + #include "gdbsupport/pathstuff.h" + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" ++#include "linux-ptrace.h" + #include + + extern char **environ; +-- +2.37.1 + diff --git a/package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch new file mode 100644 index 0000000000..ab936975e0 --- /dev/null +++ b/package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch @@ -0,0 +1,39 @@ +From 03efe04b5748703234516836cb0186d25b052556 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 6 Nov 2021 10:06:25 +0100 +Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h + include (fixed in uclibc since v1.0.35, see [1]) + +Fixes: + + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’ + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ + +[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t + +Signed-off-by: Peter Seiderer +--- + gnulib/import/getrandom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c +index 41212fb329d..0ad3f9648d2 100644 +--- a/gnulib/import/getrandom.c ++++ b/gnulib/import/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.37.1 + diff --git a/package/gdb/12.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/12.1/0007-fix-musl-build-on-riscv.patch new file mode 100644 index 0000000000..7b4133341a --- /dev/null +++ b/package/gdb/12.1/0007-fix-musl-build-on-riscv.patch @@ -0,0 +1,60 @@ +From f2dd94dce490d8e8301fba9e4684cfb8d7bc7756 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 10 Nov 2021 23:14:54 +0100 +Subject: [PATCH] fix musl build on riscv + +Fix the following build failure raised with musl: + +../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': +../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? + 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) + | ^~~~~~~~~~ + | ELF_NGREG + +musl fixed the issue with +https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 + +Fixes: + - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 + +Signed-off-by: Fabrice Fontaine +--- + gdb/nat/riscv-linux-tdesc.c | 5 +++++ + gdbserver/linux-riscv-low.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c +index 07b49c0f16e..1ff58cce16f 100644 +--- a/gdb/nat/riscv-linux-tdesc.c ++++ b/gdb/nat/riscv-linux-tdesc.c +@@ -31,6 +31,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* See nat/riscv-linux-tdesc.h. */ + + struct riscv_gdbarch_features +diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc +index 6b2902e422d..ead54db09a8 100644 +--- a/gdbserver/linux-riscv-low.cc ++++ b/gdbserver/linux-riscv-low.cc +@@ -30,6 +30,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* Linux target op definitions for the RISC-V architecture. */ + + class riscv_target : public linux_process_target +-- +2.37.1 + diff --git a/package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch new file mode 100644 index 0000000000..355ac480ee --- /dev/null +++ b/package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch @@ -0,0 +1,38 @@ +From 73487022cb629415c3b0c2d9e125035b6e5c2d32 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 18 Nov 2021 22:52:08 +0100 +Subject: [PATCH] gdbserver/Makefile.in: fix NLS build + +Fix the following build failure raised since gdb version 10.1 and +https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63: + + CXXLD libinproctrace.so +/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)': +/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext' + +Fixes: + - http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html] +--- + gdbserver/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index 47648b8d962..9d862bcb9c9 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -383,7 +383,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} + $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ + -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ +- -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread ++ -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread $(INTL) + + # Put the proper machine-specific files first, so M-. on a machine + # specific routine gets the one for the correct machine. +-- +2.37.1 + diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 71fa6f6064..c50c3d517a 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -52,6 +52,7 @@ config BR2_PACKAGE_GDB_DEBUGGER depends on BR2_USE_WCHAR depends on !BR2_sh select BR2_PACKAGE_GMP if BR2_GDB_VERSION_11 + select BR2_PACKAGE_GMP if BR2_GDB_VERSION_12 select BR2_PACKAGE_NCURSES comment "full gdb on target needs a toolchain w/ wchar" diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a294103ca3..9ee0b3f913 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -57,6 +57,9 @@ config BR2_GDB_VERSION_10 config BR2_GDB_VERSION_11 bool "gdb 11.x" +config BR2_GDB_VERSION_12 + bool "gdb 12.x" + endchoice endif @@ -68,6 +71,7 @@ config BR2_GDB_VERSION default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB default "11.2" if BR2_GDB_VERSION_11 + default "12.1" if BR2_GDB_VERSION_12 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, @@ -77,5 +81,6 @@ config BR2_PACKAGE_GDB_TOPLEVEL default y if BR2_arc default y if BR2_GDB_VERSION_10 default y if BR2_GDB_VERSION_11 + default y if BR2_GDB_VERSION_12 default y if !BR2_PACKAGE_HOST_GDB depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index cb7f4c805d..3a1027dbb5 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -2,6 +2,7 @@ sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz +sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 86e57481de..dd126b42ce 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -65,9 +65,8 @@ GDB_DEPENDENCIES += host-flex host-bison HOST_GDB_DEPENDENCIES += host-flex host-bison endif -# When BR2_GDB_VERSION_11=y, we're going to build gdb 11.x for the -# host (if enabled), so we add the necessary gmp dependency. -ifeq ($(BR2_GDB_VERSION_11),y) +# Add the necessary host-gmp dependency for the newer releases of GDB +ifeq ($(BR2_GDB_VERSION_11)$(BR2_GDB_VERSION_12),y) HOST_GDB_DEPENDENCIES += host-gmp endif @@ -155,11 +154,11 @@ GDB_CONF_OPTS += \ --without-curses endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a +# When GDB >= 11.x (because it's enabled for the host) and we're +# building the full gdb for the target, we need gmp as a # dependency. For now the default gdb version in Buildroot doesn't # require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +ifeq ($(BR2_GDB_VERSION_11)$(BR2_GDB_VERSION_12):$(BR2_PACKAGE_GDB_DEBUGGER),y:y) GDB_CONF_OPTS += \ --with-libgmp-prefix=$(STAGING_DIR)/usr GDB_DEPENDENCIES += gmp From 5c89b00a205232745aa41e307d44498f325da94a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Aug 2022 10:35:18 +0200 Subject: [PATCH 017/140] package/gdb: remove support for 9.2 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 + ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ----- ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 ---- package/gdb/9.2/0003-use-asm-sgidefs.h.patch | 40 --- .../0004-gdbserver-fix-build-for-m68k.patch | 62 ----- ...fork-inferior-include-linux-ptrace.h.patch | 53 ---- ...ppc-Fix-linker-error-with-fno-common.patch | 101 -------- ...x-Python3.9-related-runtime-problems.patch | 227 ------------------ ...t-build-gdbserver-with-m68k-and-ucli.patch | 41 ---- package/gdb/Config.in.host | 6 - package/gdb/gdb.hash | 1 - 11 files changed, 8 insertions(+), 629 deletions(-) delete mode 100644 package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch delete mode 100644 package/gdb/9.2/0003-use-asm-sgidefs.h.patch delete mode 100644 package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch delete mode 100644 package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch delete mode 100644 package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch delete mode 100644 package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch delete mode 100644 package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch diff --git a/Config.in.legacy b/Config.in.legacy index 80c443d9fb..3b6e875c0c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,14 @@ endif ############################################################################### +comment "Legacy options removed in 2022.11" + +config BR2_GDB_VERSION_9_2 + bool "gdb 9.2 removed" + help + Support for GDB 9.2 has been removed. A new version has + automatically been selected. + comment "Legacy options removed in 2022.08" config BR2_ECLIPSE_REGISTER diff --git a/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index ab8dc626f0..0000000000 --- a/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 72ee19f54fd35595465b2e35eccf1f3d65fe21c6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2016 17:32:50 -0700 -Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.3] -Signed-off-by: Romain Naour ---- - gdb/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53fe9..1978347c02c 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -23,7 +23,13 @@ - #include "elf/common.h" - #include - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "arch/ppc-linux-common.h" - #include "arch/ppc-linux-tdesc.h" -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b357..40399361c09 100644 ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,13 @@ - #ifndef NAT_PPC_LINUX_H - #define NAT_PPC_LINUX_H - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - #include - - /* This sometimes isn't defined. */ --- -2.21.0 - diff --git a/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index 9d508fbf1e..0000000000 --- a/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ef630288fdc2d4d22651702672f9d5c9cd767e5b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC - systems - -Fixes a pt_{dsp,}regs redefinition when building with the musl C library -on SuperH. - -Inspired by -http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, -adapted for SuperH. - -Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.0] -Signed-off-by: Romain Naour ---- - gdb/gdbserver/linux-sh-low.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index 0953721a190..c331c1382f7 100644 ---- a/gdb/gdbserver/linux-sh-low.c -+++ b/gdb/gdbserver/linux-sh-low.c -@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; - #include - #endif - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+# define pt_dspregs uapi_pt_dspregs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+# undef pt_dspregs -+#endif - - #define sh_num_regs 41 - --- -2.21.0 - diff --git a/package/gdb/9.2/0003-use-asm-sgidefs.h.patch b/package/gdb/9.2/0003-use-asm-sgidefs.h.patch deleted file mode 100644 index 2909f62c68..0000000000 --- a/package/gdb/9.2/0003-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 19a0f664809b6858e69aa98188eb739415de044c Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index e68ed1e4da9..bc42aa59685 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include -+#include - #include "nat/gdb_ptrace.h" - #include - #include "inf-ptrace.h" --- -2.21.0 - diff --git a/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch deleted file mode 100644 index d718293899..0000000000 --- a/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 448e481aab86c823d908530038e20a14213db0a2 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 22 Jun 2018 22:40:26 +0200 -Subject: [PATCH] gdbserver: fix build for m68k -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As for strace [1], when is included after , -the build fails on m68k with the following diagnostics: - -In file included from ./../nat/linux-ptrace.h:28:0, - from linux-low.h:27, - from linux-m68k-low.c:20: -[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant - PT_D1 = 0, - ^ -[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant -[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant -In file included from linux-m68k-low.c:27:0: -[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token - }; - ^ - -Fix this by moving on top of "linux-low.h". - -[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 - -Signed-off-by: Romain Naour ---- - gdb/gdbserver/linux-m68k-low.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 16f639d02fc..969d9973737 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -17,16 +17,17 @@ - along with this program. If not, see . */ - - #include "server.h" -+ -+#ifdef HAVE_SYS_REG_H -+#include -+#endif -+ - #include "linux-low.h" - - /* Defined in auto-generated file reg-m68k.c. */ - void init_registers_m68k (void); - extern const struct target_desc *tdesc_m68k; - --#ifdef HAVE_SYS_REG_H --#include --#endif -- - #define m68k_num_regs 29 - #define m68k_num_gregs 18 - --- -2.21.0 - diff --git a/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch deleted file mode 100644 index 1df5452682..0000000000 --- a/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d84ecfa3a8c8fbade89229ac66c09f2a97ab00fb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 24 Jun 2018 23:33:55 +0200 -Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h - -To decide whether fork() or vfork() should be used, fork-inferior.c -uses the following test: - - #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) - -However, HAS_NOMMU is never defined, because it gets defined in -linux-ptrace.h, which is not included by fork-inferior.c. Due to this, -gdbserver fails to build on noMMU architectures. This commit fixes -that by simply including linux-ptrace.h. - -This bug was introduced by commit -2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al -with gdbserver"). Indeed, the same fork()/vfork() selection was done, -but in another file where linux-ptrace.h was included. - -Fixes the following build issue: - -../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': -../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope - pid = fork (); - ^~~~ -../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' - pid = fork (); - ^~~~ - vfork - -Signed-off-by: Thomas Petazzoni -[Romain: rebase on gdb 8.3] -Signed-off-by: Romain Naour ---- - gdb/nat/fork-inferior.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c -index fe9360a5039..626fe7c1fbf 100644 ---- a/gdb/nat/fork-inferior.c -+++ b/gdb/nat/fork-inferior.c -@@ -27,6 +27,7 @@ - #include "gdbsupport/pathstuff.h" - #include "gdbsupport/signals-state-save-restore.h" - #include "gdbsupport/gdb_tilde_expand.h" -+#include "linux-ptrace.h" - #include - - extern char **environ; --- -2.21.0 - diff --git a/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch b/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch deleted file mode 100644 index 813a1054a5..0000000000 --- a/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch +++ /dev/null @@ -1,101 +0,0 @@ -From ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 Mon Sep 17 00:00:00 2001 -From: Sebastian Huber -Date: Wed, 1 Jul 2020 19:29:55 +0200 -Subject: [PATCH] sim/ppc: Fix linker error with -fno-common - -GCC 10 enables -fno-common by default. This resulted in a multiple -definition linker error since global variables were declared and defined -in a header file: - - ld: ld-insn.o:sim/ppc/ld-insn.h:221: multiple definition of - `max_model_fields_len'; igen.o:sim/ppc/ld-insn.h:221: first defined here - -sim/ppc - - * ld-insn.h (last_model, last_model_data, last_model_function, - last_model_internal, last_model_macro, last_model_static): - Delete. - (max_model_fields_len, model_data, model_functions, - model_internal, model_macros, model_static, models): Declare, but do not - define. - * ld-insn.c (last_model, last_model_data, last_model_function, - last_model_internal, last_model_macro, last_model_static, - max_model_fields_len, model_data, model_functions, - model_internal, model_macros, model_static, models): Define. - -Signed-off-by: Maxim Kochetkov -Fetch from: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 ---- - sim/ppc/ld-insn.c | 18 ++++++++++++++++++ - sim/ppc/ld-insn.h | 24 +++++++----------------- - 2 files changed, 25 insertions(+), 17 deletions(-) - -diff --git a/sim/ppc/ld-insn.c b/sim/ppc/ld-insn.c -index e39131ca133..585071a861f 100644 ---- a/sim/ppc/ld-insn.c -+++ b/sim/ppc/ld-insn.c -@@ -28,6 +28,24 @@ - - #include "igen.h" - -+static model *last_model; -+ -+static insn *last_model_macro; -+static insn *last_model_function; -+static insn *last_model_internal; -+static insn *last_model_static; -+static insn *last_model_data; -+ -+model *models; -+ -+insn *model_macros; -+insn *model_functions; -+insn *model_internal; -+insn *model_static; -+insn *model_data; -+ -+int max_model_fields_len; -+ - static void - update_depth(insn_table *entry, - lf *file, -diff --git a/sim/ppc/ld-insn.h b/sim/ppc/ld-insn.h -index 88318ffa2b3..52baeaa2d84 100644 ---- a/sim/ppc/ld-insn.h -+++ b/sim/ppc/ld-insn.h -@@ -200,25 +200,15 @@ extern insn_table *load_insn_table - table_include *includes, - cache_table **cache_rules); - --model *models; --model *last_model; -+extern model *models; - --insn *model_macros; --insn *last_model_macro; -+extern insn *model_macros; -+extern insn *model_functions; -+extern insn *model_internal; -+extern insn *model_static; -+extern insn *model_data; - --insn *model_functions; --insn *last_model_function; -- --insn *model_internal; --insn *last_model_internal; -- --insn *model_static; --insn *last_model_static; -- --insn *model_data; --insn *last_model_data; -- --int max_model_fields_len; -+extern int max_model_fields_len; - - extern void insn_table_insert_insn - (insn_table *table, --- -2.18.4 - diff --git a/package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch b/package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch deleted file mode 100644 index 89b0cdc4a0..0000000000 --- a/package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch +++ /dev/null @@ -1,227 +0,0 @@ -From c47bae859a5af0d95224d90000df0e529f7c5aa0 Mon Sep 17 00:00:00 2001 -From: Kevin Buettner -Date: Wed, 27 May 2020 20:05:40 -0700 -Subject: [PATCH] Fix Python3.9 related runtime problems - -Python3.9b1 is now available on Rawhide. GDB w/ Python 3.9 support -can be built using the configure switch -with-python=/usr/bin/python3.9. - -Attempting to run gdb/Python3.9 segfaults on startup: - - #0 0x00007ffff7b0582c in PyEval_ReleaseLock () from /lib64/libpython3.9.so.1.0 - #1 0x000000000069ccbf in do_start_initialization () - at worktree-test1/gdb/python/python.c:1789 - #2 _initialize_python () - at worktree-test1/gdb/python/python.c:1877 - #3 0x00000000007afb0a in initialize_all_files () at init.c:237 - ... - -Consulting the the documentation... - -https://docs.python.org/3/c-api/init.html - -...we find that PyEval_ReleaseLock() has been deprecated since version -3.2. It recommends using PyEval_SaveThread or PyEval_ReleaseThread() -instead. In do_start_initialization, in gdb/python/python.c, we -can replace the calls to PyThreadState_Swap() and PyEval_ReleaseLock() -with a single call to PyEval_SaveThread. (Thanks to Keith Seitz -for working this out.) - -With that in place, GDB gets a little bit further. It still dies -on startup, but the backtrace is different: - - #0 0x00007ffff7b04306 in PyOS_InterruptOccurred () - from /lib64/libpython3.9.so.1.0 - #1 0x0000000000576e86 in check_quit_flag () - at worktree-test1/gdb/extension.c:776 - #2 0x0000000000576f8a in set_active_ext_lang (now_active=now_active@entry=0x983c00 ) - at worktree-test1/gdb/extension.c:705 - #3 0x000000000069d399 in gdbpy_enter::gdbpy_enter (this=0x7fffffffd2d0, - gdbarch=0x0, language=0x0) - at worktree-test1/gdb/python/python.c:211 - #4 0x0000000000686e00 in python_new_inferior (inf=0xddeb10) - at worktree-test1/gdb/python/py-inferior.c:251 - #5 0x00000000005d9fb9 in std::function::operator()(inferior*) const (__args#0=, this=0xccad20) - at /usr/include/c++/10/bits/std_function.h:617 - #6 gdb::observers::observable::notify (args#0=0xddeb10, - this=) - at worktree-test1/gdb/../gdbsupport/observable.h:106 - #7 add_inferior_silent (pid=0) - at worktree-test1/gdb/inferior.c:113 - #8 0x00000000005dbcb8 in initialize_inferiors () - at worktree-test1/gdb/inferior.c:947 - ... - -We checked with some Python Developers and were told that we should -acquire the GIL prior to calling any Python C API function. We -definitely don't have the GIL for calls of PyOS_InterruptOccurred(). - -I moved class_gdbpy_gil earlier in the file and use it in -gdbpy_check_quit_flag() to acquire (and automatically release) the -GIL. - -With those changes in place, I was able to run to a GDB prompt. But, -when trying to quit, it segfaulted again due to due to some other -problems with gdbpy_check_quit_flag(): - - Thread 1 "gdb" received signal SIGSEGV, Segmentation fault. - 0x00007ffff7bbab0c in new_threadstate () from /lib64/libpython3.9.so.1.0 - (top-gdb) bt 8 - #0 0x00007ffff7bbab0c in new_threadstate () from /lib64/libpython3.9.so.1.0 - #1 0x00007ffff7afa5ea in PyGILState_Ensure.cold () - from /lib64/libpython3.9.so.1.0 - #2 0x000000000069b58c in gdbpy_gil::gdbpy_gil (this=) - at worktree-test1/gdb/python/python.c:278 - #3 gdbpy_check_quit_flag (extlang=) - at worktree-test1/gdb/python/python.c:278 - #4 0x0000000000576e96 in check_quit_flag () - at worktree-test1/gdb/extension.c:776 - #5 0x000000000057700c in restore_active_ext_lang (previous=0xe9c050) - at worktree-test1/gdb/extension.c:729 - #6 0x000000000088913a in do_my_cleanups ( - pmy_chain=0xc31870 , - old_chain=0xae5720 ) - at worktree-test1/gdbsupport/cleanups.cc:131 - #7 do_final_cleanups () - at worktree-test1/gdbsupport/cleanups.cc:143 - -In this case, we're trying to call a Python C API function after -Py_Finalize() has been called from finalize_python(). I made -finalize_python set gdb_python_initialized to false and then cause -check_quit_flag() to return early when it's false. - -With these changes in place, GDB seems to be working again with -Python3.9b1. I think it likely that there are other problems lurking. -I wouldn't be surprised to find that there are other calls into Python -where we don't first make sure that we have the GIL. Further changes -may well be needed. - -I see no regressions testing on Rawhide using a GDB built with the -default Python version (3.8.3) versus one built using Python 3.9b1. - -I've also tested on Fedora 28, 29, 30, 31, and 32 (all x86_64) using -the default (though updated) system installed versions of Python on -those OSes. This means that I've tested against Python versions -2.7.15, 2.7.17, 2.7.18, 3.7.7, 3.8.2, and 3.8.3. In each case GDB -still builds without problem and shows no regressions after applying -this patch. - -gdb/ChangeLog: - -2020-MM-DD Kevin Buettner - Keith Seitz - - * python/python.c (do_start_initialization): For Python 3.9 and - later, call PyEval_SaveThread instead of PyEval_ReleaseLock. - (class gdbpy_gil): Move to earlier in file. - (finalize_python): Set gdb_python_initialized. - (gdbpy_check_quit_flag): Acquire GIL via gdbpy_gil. Return early - when not initialized. - - -[import into Buildroot, removing ChangeLog change to avoid conflict] -Signed-off-by: Thomas De Schampheleire - ---- - gdb/ChangeLog | 10 ++++++++ - gdb/python/python.c | 56 ++++++++++++++++++++++++--------------------- - 2 files changed, 40 insertions(+), 26 deletions(-) - -diff --git a/gdb/python/python.c b/gdb/python/python.c -index 67f362b852d..4bdd2201abc 100644 ---- a/gdb/python/python.c -+++ b/gdb/python/python.c -@@ -238,6 +238,30 @@ gdbpy_enter::~gdbpy_enter () - PyGILState_Release (m_state); - } - -+/* A helper class to save and restore the GIL, but without touching -+ the other globals that are handled by gdbpy_enter. */ -+ -+class gdbpy_gil -+{ -+public: -+ -+ gdbpy_gil () -+ : m_state (PyGILState_Ensure ()) -+ { -+ } -+ -+ ~gdbpy_gil () -+ { -+ PyGILState_Release (m_state); -+ } -+ -+ DISABLE_COPY_AND_ASSIGN (gdbpy_gil); -+ -+private: -+ -+ PyGILState_STATE m_state; -+}; -+ - /* Set the quit flag. */ - - static void -@@ -251,6 +275,10 @@ gdbpy_set_quit_flag (const struct extension_language_defn *extlang) - static int - gdbpy_check_quit_flag (const struct extension_language_defn *extlang) - { -+ if (!gdb_python_initialized) -+ return 0; -+ -+ gdbpy_gil gil; - return PyOS_InterruptOccurred (); - } - -@@ -943,30 +971,6 @@ gdbpy_source_script (const struct extension_language_defn *extlang, - - /* Posting and handling events. */ - --/* A helper class to save and restore the GIL, but without touching -- the other globals that are handled by gdbpy_enter. */ -- --class gdbpy_gil --{ --public: -- -- gdbpy_gil () -- : m_state (PyGILState_Ensure ()) -- { -- } -- -- ~gdbpy_gil () -- { -- PyGILState_Release (m_state); -- } -- -- DISABLE_COPY_AND_ASSIGN (gdbpy_gil); -- --private: -- -- PyGILState_STATE m_state; --}; -- - /* A single event. */ - struct gdbpy_event - { -@@ -1616,6 +1620,7 @@ finalize_python (void *ignore) - - Py_Finalize (); - -+ gdb_python_initialized = false; - restore_active_ext_lang (previous_active); - } - -@@ -1785,8 +1790,7 @@ do_start_initialization () - return false; - - /* Release the GIL while gdb runs. */ -- PyThreadState_Swap (NULL); -- PyEval_ReleaseLock (); -+ PyEval_SaveThread (); - - make_final_cleanup (finalize_python, NULL); - --- -2.26.3 - diff --git a/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch b/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch deleted file mode 100644 index 5cdafae7a8..0000000000 --- a/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 808601f075fe3dd8ca101e31c9121a4e87f0bfc7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 6 May 2021 07:45:00 +0200 -Subject: [PATCH] gdb/configure.tgt: build gdbserver with m68k and - uclibc - -Allow to build gdbserver with m68k and uclibc: - -checking whether gdbserver is supported on this host... no -configure: error: Automatic gdbserver build is not supported for this configuration - -Fixes: - - http://autobuild.buildroot.org/results/f4d6d9d8418c0da48a3db4ad5a82e19bd16eae34 - -Signed-off-by: Fabrice Fontaine ---- - gdb/configure.tgt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdb/configure.tgt b/gdb/configure.tgt -index caa42be1c01..8666bc5d0bf 100644 ---- a/gdb/configure.tgt -+++ b/gdb/configure.tgt -@@ -372,12 +372,12 @@ m68hc11*-*-*|m6811*-*-*) - gdb_sim=../sim/m68hc11/libsim.a - ;; - --m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | m68*-*-uclinux* | \ -+m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | \ - fido-*-elf*) - # Target: Motorola m68k embedded - gdb_target_obs="m68k-tdep.o" - ;; --m68*-*-linux*) -+m68*-*-*linux*) - # Target: Motorola m68k with a.out and ELF - gdb_target_obs="m68k-tdep.o m68k-linux-tdep.o solib-svr4.o \ - linux-tdep.o glibc-tdep.o symfile-mem.o" --- -2.30.2 - diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 9ee0b3f913..9876c4e8bc 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -46,11 +46,6 @@ choice help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_9_2 - bool "gdb 9.2.x" - # gdbserver support missing - depends on !BR2_riscv - config BR2_GDB_VERSION_10 bool "gdb 10.x" @@ -68,7 +63,6 @@ endif config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc - default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB default "11.2" if BR2_GDB_VERSION_11 default "12.1" if BR2_GDB_VERSION_12 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 3a1027dbb5..04c7d02d2f 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz From 7b977af16e67c9dfeac943c0c5c59840a8c2f233 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Aug 2022 10:35:19 +0200 Subject: [PATCH 018/140] package/gdb: invert the logic to add the dependency on gmp The handling of the GMP dependency needs a bit of change. Until now, the GMP dependency was needed when building full GDB (host or target) in version 11.x or 12.x, so we were explicitly checking whether those versions were enabled. Now that only GDB 10.x and the ARC-specific version of GDB are the only remaining ones not needing GMP, we invert the logic: only those two versions do not trigger the addition of the GMP dependency. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: split off to its own patch] Signed-off-by: Yann E. MORIN --- package/gdb/Config.in | 3 +-- package/gdb/gdb.mk | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index c50c3d517a..273b3072ae 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -51,8 +51,7 @@ config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" depends on BR2_USE_WCHAR depends on !BR2_sh - select BR2_PACKAGE_GMP if BR2_GDB_VERSION_11 - select BR2_PACKAGE_GMP if BR2_GDB_VERSION_12 + select BR2_PACKAGE_GMP if !BR2_GDB_VERSION_10 && !BR2_arc select BR2_PACKAGE_NCURSES comment "full gdb on target needs a toolchain w/ wchar" diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index dd126b42ce..d2bbfcb290 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -65,8 +65,9 @@ GDB_DEPENDENCIES += host-flex host-bison HOST_GDB_DEPENDENCIES += host-flex host-bison endif -# Add the necessary host-gmp dependency for the newer releases of GDB -ifeq ($(BR2_GDB_VERSION_11)$(BR2_GDB_VERSION_12),y) +# All newer versions of GDB need host-gmp, so it's only for older +# versions that the dependency can be avoided. +ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc),) HOST_GDB_DEPENDENCIES += host-gmp endif @@ -154,11 +155,10 @@ GDB_CONF_OPTS += \ --without-curses endif -# When GDB >= 11.x (because it's enabled for the host) and we're -# building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_GDB_VERSION_12):$(BR2_PACKAGE_GDB_DEBUGGER),y:y) +# Starting from GDB 11.x, gmp is needed as a dependency to build full +# gdb. So we avoid the dependency only for GDB 10.x and the special +# version used on ARC. +ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y) GDB_CONF_OPTS += \ --with-libgmp-prefix=$(STAGING_DIR)/usr GDB_DEPENDENCIES += gmp From c4eddacad79509c9786672a2abab1ba45de600c7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Aug 2022 17:56:56 +0200 Subject: [PATCH 019/140] package/gdb: switch to GDB 11.x as the Now that GDB 12.x has been added, and GDB 9.x removed, we can make GDB 11.x the default version. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: split off to its own patch] Signed-off-by: Yann E. MORIN --- package/gdb/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 9876c4e8bc..33ffc632ee 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,7 +41,7 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_10 + default BR2_GDB_VERSION_11 depends on !BR2_arc help Select the version of gdb you wish to use. @@ -63,8 +63,8 @@ endif config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc - default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.2" if BR2_GDB_VERSION_11 + default "10.2" if BR2_GDB_VERSION_10 + default "11.2" if BR2_GDB_VERSION_11 || !BR2_PACKAGE_HOST_GDB default "12.1" if BR2_GDB_VERSION_12 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB From 3ae900bcf965b79982a8780d5010ee512576a735 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Aug 2022 10:35:20 +0200 Subject: [PATCH 020/140] package/gdb: remove BR2_PACKAGE_GDB_TOPLEVEL This option was needed to build versions of GDB < 10.x. As we just dropped support for GDB 9.x, this logic can now be removed. The special case to configure just gdbserver was only valid for gdb<10, but was guarded by !GDB_TOPLEVEL (which was equivalent to gdb<10). GDB_TOPLEVEL is now always true, so we can't hit that special case anymore. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: add little blurb about gdbserver] Signed-off-by: Yann E. MORIN --- package/gdb/Config.in.host | 11 ----------- package/gdb/gdb.mk | 13 ++----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 33ffc632ee..a88c8affb3 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -67,14 +67,3 @@ config BR2_GDB_VERSION default "11.2" if BR2_GDB_VERSION_11 || !BR2_PACKAGE_HOST_GDB default "12.1" if BR2_GDB_VERSION_12 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - -# recent gdb versions (>= 10) have gdbserver moved at the top-level, -# which requires a different build logic. -config BR2_PACKAGE_GDB_TOPLEVEL - bool - default y if BR2_arc - default y if BR2_GDB_VERSION_10 - default y if BR2_GDB_VERSION_11 - default y if BR2_GDB_VERSION_12 - default y if !BR2_PACKAGE_HOST_GDB - depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index d2bbfcb290..45ce126bab 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -18,23 +18,14 @@ GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB GDB_CPE_ID_VENDOR = gnu -# On gdb < 10, if you want to build only gdbserver, you need to -# configure only gdb/gdbserver. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(BR2_PACKAGE_GDB_TOPLEVEL),) -GDB_SUBDIR = gdb/gdbserver - -# When we want to build the full gdb, or for very recent versions of -# gdb with gdbserver at the top-level, out of tree build is mandatory, -# so we create a 'build' subdirectory in the gdb sources, and build -# from there. -else +# Out of tree build is mandatory, so we create a 'build' subdirectory +# in the gdb sources, and build from there. GDB_SUBDIR = build define GDB_CONFIGURE_SYMLINK mkdir -p $(@D)/$(GDB_SUBDIR) ln -sf ../configure $(@D)/$(GDB_SUBDIR)/configure endef GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK -endif # For the host variant, we really want to build with XML support, # which is needed to read XML descriptions of target architectures. We From 4990cf7a599f41324b91e946f81a9f836e14469e Mon Sep 17 00:00:00 2001 From: Yair Ben-Avraham Date: Mon, 15 Aug 2022 04:06:02 +0000 Subject: [PATCH 021/140] package/rsync: bump version to 3.2.5 Fix https://nvd.nist.gov/vuln/detail/CVE-2022-29154 Remove 0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch, applied to master: https://github.com/WayneD/rsync/commit/c3f7414c450faaf6a8281cc4a4403529aeb7d859 remove 0002-Handle-linking-with-a-zlib-with-external-read_buf.patch b/package/rsync/0002-Handle-linking-with-a-zlib-with-external-read_buf.patch, applied to naster: https://github.com/WayneD/rsync/commit/60dd42be603a79cd57cec076fe1680e9037be774 Signed-off-by: Yair Ben-Avraham Signed-off-by: Thomas Petazzoni --- ...n-the-certificate-when-using-openssl.patch | 29 ------------------- ...g-with-a-zlib-with-external-read_buf.patch | 27 ----------------- package/rsync/rsync.hash | 6 ++-- package/rsync/rsync.mk | 2 +- 4 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch delete mode 100644 package/rsync/0002-Handle-linking-with-a-zlib-with-external-read_buf.patch diff --git a/package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch b/package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch deleted file mode 100644 index 13edeff944..0000000000 --- a/package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c3f7414c450faaf6a8281cc4a4403529aeb7d859 Mon Sep 17 00:00:00 2001 -From: Matt McCutchen -Date: Wed, 26 Aug 2020 12:16:08 -0400 -Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using - openssl. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.samba.org/?p=rsync.git;a=commitdiff;h=c3f7414c450faaf6a8281cc4a4403529aeb7d859] ---- - rsync-ssl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync-ssl b/rsync-ssl -index 8101975a..46701af1 100755 ---- a/rsync-ssl -+++ b/rsync-ssl -@@ -129,7 +129,7 @@ function rsync_ssl_helper { - fi - - if [[ $RSYNC_SSL_TYPE == openssl ]]; then -- exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port -+ exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port - elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then - exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port - else --- -2.25.1 - diff --git a/package/rsync/0002-Handle-linking-with-a-zlib-with-external-read_buf.patch b/package/rsync/0002-Handle-linking-with-a-zlib-with-external-read_buf.patch deleted file mode 100644 index 0af090732c..0000000000 --- a/package/rsync/0002-Handle-linking-with-a-zlib-with-external-read_buf.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 60dd42be603a79cd57cec076fe1680e9037be774 Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Mon, 11 Apr 2022 08:29:54 -0700 -Subject: [PATCH] Handle linking with a zlib with external read_buf. - -[Retrieved from: -https://github.com/WayneD/rsync/commit/60dd42be603a79cd57cec076fe1680e9037be774] -Signed-off-by: Fabrice Fontaine ---- - rsync.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/rsync.h b/rsync.h -index 4b30570b..e5aacd25 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -1172,6 +1172,10 @@ struct name_num_obj { - struct name_num_item list[10]; /* we'll get a compile error/warning if this is ever too small */ - }; - -+#ifdef EXTERNAL_ZLIB -+#define read_buf read_buf_ -+#endif -+ - #ifndef __cplusplus - #include "proto.h" - #endif diff --git a/package/rsync/rsync.hash b/package/rsync/rsync.hash index 92f6156ba8..f0ba4d321d 100644 --- a/package/rsync/rsync.hash +++ b/package/rsync/rsync.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz.asc -sha256 becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e rsync-3.2.3.tar.gz +# https://download.samba.org/pub/rsync/src/rsync-3.2.5.tar.gz.asc +sha256 2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba rsync-3.2.5.tar.gz # Locally calculated -sha256 0d33aa97d302cb9df27f99dfa28d58001c2479a02317956f1a7a890f3937a976 COPYING +sha256 85c19ea50a224c2d0067a69c083584e5717b40b76610ec1218f91385775067dd COPYING diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 5b51ca1df7..d2c772a75a 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYNC_VERSION = 3.2.3 +RSYNC_VERSION = 3.2.5 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING From b92dc8bd0f73615eaf63f9aad33bbf63b208603d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 14 Aug 2022 20:22:45 -0600 Subject: [PATCH 022/140] package/python-maturin: bump to version 0.13.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 2604dd40c4..bf00a5f431 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 1c385169ef87ecc076c1471ccd9efdd60d151d1f5d566f1117ca73ea926f7698 maturin-0.13.1.tar.gz +sha256 759ce1b8fa1208fc5569055e0b72155d3c5479ce0f31b8d5034feee3cffaa3a6 maturin-0.13.2.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 b92738822e..cc45cb31ff 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.13.1 +PYTHON_MATURIN_VERSION = 0.13.2 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/9b/a2/9b8377c61a0ded0b9c832343ca4bc1069e07bbcf8f844be6faf4858c7a48 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/2a/51/4794343461971a67a85db5025b7c89928c603957d6b00c9e940bc26a3cb3 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From 4d32bd37458d6fa2b418c1a37aba59fcba9f3fac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2022 11:49:34 +0200 Subject: [PATCH 023/140] package/makedumpfile: add zstd optional dependency zstd is an optional dependency since bump to version 1.7.0 in commit bbc52f3ff382e4c50baea2e1876a3f6ebf77a851 and https://github.com/makedumpfile/makedumpfile/commit/afd0a6db2a0543217f8e46955a1b44b71f7e7ef3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/makedumpfile/makedumpfile.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 8399e4d063..b787f0f387 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -30,6 +30,11 @@ MAKEDUMPFILE_DEPENDENCIES += snappy MAKEDUMPFILE_MAKE_OPTS += USESNAPPY=on endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +MAKEDUMPFILE_DEPENDENCIES += zstd +MAKEDUMPFILE_MAKE_OPTS += USEZSTD=on +endif + define MAKEDUMPFILE_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ $(MAKEDUMPFILE_MAKE_OPTS) From 0b389385666687ecfd09cdbce6c6ecfd74ce11ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2022 11:50:22 +0200 Subject: [PATCH 024/140] package/makedumpfile: add mips64 support mips64 is supported since bump to version 1.6.9 in commit cb648d12fa733788cd2ea8e0fa8b00bb95983c4e and https://github.com/makedumpfile/makedumpfile/commit/7f185d29aa1794a82a090c748aae2f7bf240fb49 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/makedumpfile/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/makedumpfile/Config.in b/package/makedumpfile/Config.in index d5af38b598..62549f851f 100644 --- a/package/makedumpfile/Config.in +++ b/package/makedumpfile/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS 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_mips64 || BR2_mips64el default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_s390x default y if BR2_sparc64 From 22b3b3a77720d9527b8279d033d9fbca65b2bcba Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 Aug 2022 19:41:26 -0700 Subject: [PATCH 025/140] package/go: bump to version 1.19 Go 1.19 is a major release with changes to the implementation of the toolchain, runtime, and libraries. Dropped patch 0002-cmd-dist-use-gohostarch... as it was merged upstream. https://go.dev/doc/go1.19 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- ...explicit-option-for-crosscompilation.patch | 4 +- ...use-gohostarch-for-ssa-rewrite-check.patch | 95 ------------------- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 4 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch diff --git a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/0001-build.go-explicit-option-for-crosscompilation.patch index 3a9b47474c..992a83a644 100644 --- a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch +++ b/package/go/0001-build.go-explicit-option-for-crosscompilation.patch @@ -1,4 +1,4 @@ -From 335c6245674088de616324398137416c7a1cbe8f Mon Sep 17 00:00:00 2001 +From 6aed475557032a7ff9009e9b4b691b40b561876a Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 8 May 2018 16:08:44 +0200 Subject: [PATCH] build.go: explicit option for crosscompilation @@ -17,7 +17,7 @@ Signed-off-by: Anisse Astier 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index f99f1f4e43..08a9f24f59 100644 +index 7c44c4a605..03500920c4 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -286,12 +286,13 @@ func xinit() { diff --git a/package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch b/package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch deleted file mode 100644 index 2346208640..0000000000 --- a/package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 38d841a18ab0bcb63554fed6b38012e504599891 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Wed, 1 Jun 2022 20:52:12 +0000 -Subject: [PATCH] cmd/dist: use gohostarch for ssa rewrite check - -Fix a build failure when bootstrapping the Go compiler with go-bootstrap 1.4 -while the environment contains GOARCH=riscv64. - -Building Go toolchain1 using go-1.4-bootstrap-20171003. -src/cmd/compile/internal/ssa/rewriteRISCV64.go:4814 -invalid operation: y << x (shift count type int64, must be unsigned integer) - -This is because: - - - buildtool.go:198: calls bootstrapRewriteFile(src) - - bootstrapRewriteFile: buildtool.go:283 calls: - - isUnneededSSARewriteFile: checks os.Getenv("GOARCH") - - isUnneededSSARewriteFile: returns "", false - - bootstrapRewriteFile: calls bootstrapFixImports - - boostrapFixImports: generates code go1.4 cannot compile - -Instead of checking "GOARCH" in the environment, use the gohostarch variable. - -Change-Id: Ie9c190498555c4068461fead6278a62e924062c6 -GitHub-Last-Rev: 300d7a7fea0a67c696970fd271e2ce709674a658 -GitHub-Pull-Request: golang/go#52362 -Reviewed-on: https://go-review.googlesource.com/c/go/+/400376 -Reviewed-by: Bryan Mills -TryBot-Result: Gopher Robot -Reviewed-by: Dmitri Shuralyov -Auto-Submit: Bryan Mills -Run-TryBot: Bryan Mills -Reviewed-by: Joel Sing -Run-TryBot: Joel Sing ---- - src/cmd/dist/buildtool.go | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go -index 036f8c52fa..2d8ace52d8 100644 ---- a/src/cmd/dist/buildtool.go -+++ b/src/cmd/dist/buildtool.go -@@ -16,7 +16,6 @@ import ( - "os" - "path/filepath" - "regexp" -- "runtime" - "strings" - ) - -@@ -239,11 +238,11 @@ var ssaRewriteFileSubstring = filepath.FromSlash("src/cmd/compile/internal/ssa/r - - // isUnneededSSARewriteFile reports whether srcFile is a - // src/cmd/compile/internal/ssa/rewriteARCHNAME.go file for an --// architecture that isn't for the current runtime.GOARCH. -+// architecture that isn't for the given GOARCH. - // - // When unneeded is true archCaps is the rewrite base filename without - // the "rewrite" prefix or ".go" suffix: AMD64, 386, ARM, ARM64, etc. --func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) { -+func isUnneededSSARewriteFile(srcFile, goArch string) (archCaps string, unneeded bool) { - if !strings.Contains(srcFile, ssaRewriteFileSubstring) { - return "", false - } -@@ -258,13 +257,10 @@ func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) { - archCaps = fileArch - fileArch = strings.ToLower(fileArch) - fileArch = strings.TrimSuffix(fileArch, "splitload") -- if fileArch == os.Getenv("GOHOSTARCH") { -+ if fileArch == goArch { - return "", false - } -- if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") { -- return "", false -- } -- if fileArch == strings.TrimSuffix(os.Getenv("GOARCH"), "le") { -+ if fileArch == strings.TrimSuffix(goArch, "le") { - return "", false - } - return archCaps, true -@@ -273,9 +269,9 @@ func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) { - func bootstrapRewriteFile(srcFile string) string { - // During bootstrap, generate dummy rewrite files for - // irrelevant architectures. We only need to build a bootstrap -- // binary that works for the current runtime.GOARCH. -+ // binary that works for the current gohostarch. - // This saves 6+ seconds of bootstrap. -- if archCaps, ok := isUnneededSSARewriteFile(srcFile); ok { -+ if archCaps, ok := isUnneededSSARewriteFile(srcFile, gohostarch); ok { - return fmt.Sprintf(`// Code generated by go tool dist; DO NOT EDIT. - - package ssa --- -2.35.1 - diff --git a/package/go/go.hash b/package/go/go.hash index 2a0f02abfd..2b877145e9 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 9920d3306a1ac536cdd2c796d6cb3c54bc559c226fc3cc39c32f1e0bd7f50d2a go1.18.5.src.tar.gz +sha256 9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9 go1.19.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 16602e590b..2220953e55 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.18.5 +GO_VERSION = 1.19 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 11e11b8fda94dd12d4b8cb6565808e91c4743fed Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Aug 2022 00:05:28 +0200 Subject: [PATCH 026/140] package/crda: bump to version 4.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/crda/0002-drop-ldconfig-call.patch | 4 +++- package/crda/crda.hash | 2 +- package/crda/crda.mk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/crda/0002-drop-ldconfig-call.patch b/package/crda/0002-drop-ldconfig-call.patch index f09e258adb..567840c07e 100644 --- a/package/crda/0002-drop-ldconfig-call.patch +++ b/package/crda/0002-drop-ldconfig-call.patch @@ -1,6 +1,8 @@ Drop ldconfig call, it's useless for cross-compiling. Signed-off-by: Gustavo Zacarias +[Fabrice: update for 4.15] +Signed-off-by: Fabrice Fontaine diff -Nura crda-3.18.orig/Makefile crda-3.18/Makefile --- crda-3.18.orig/Makefile 2015-02-18 10:34:23.841259401 -0300 @@ -8,7 +10,7 @@ diff -Nura crda-3.18.orig/Makefile crda-3.18/Makefile @@ -127,7 +127,6 @@ $(NQ) ' INSTALL libreg' $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ + $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig %.o: %.c regdb.h $(LIBREG) diff --git a/package/crda/crda.hash b/package/crda/crda.hash index 2a263d172a..3b0610994e 100644 --- a/package/crda/crda.hash +++ b/package/crda/crda.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 crda-4.14.tar.gz +sha256 99eb58f774f6016c380def0d80fffd573d2be0ad5f117b678c1968ed5657af82 crda-4.15.tar.gz sha256 c16224b376128b589eea69a8fdd1f09818b8cb995e10d1e37f72dff22233d7b0 LICENSE diff --git a/package/crda/crda.mk b/package/crda/crda.mk index 31a64d004b..a73c9aa26d 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRDA_VERSION = 4.14 +CRDA_VERSION = 4.15 CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC From 1c3b7870cf4bbabb0b19abb2e28e8040980645f2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Aug 2022 18:56:30 +0200 Subject: [PATCH 027/140] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER This helper was introduced before Freescale was part of NXP. Nowadays, we have NXP packages, and they do use the same archiving format. Move the Freescale-specific extract helper to a common location, so that it can be used by other packages in the future. Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: provide the rationale in the commit log] Signed-off-by: Yann E. MORIN --- package/freescale-imx/freescale-imx.mk | 25 ------------------------- package/pkg-utils.mk | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 84a1725cc1..5f32a098a2 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -6,29 +6,4 @@ FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO -# Helper for self-extracting binaries distributed by Freescale. -# -# The --force option makes sure it doesn't fail if the source -# directory already exists. The --auto-accept skips the license check, -# as it is not needed in Buildroot because we have legal-info. Since -# there's a EULA in the binary file, we extract it in this macro, and -# it should therefore be added to the LICENSE_FILES variable of -# packages using this macro. Also, remember to set REDISTRIBUTE to -# "NO". Indeed, this is a legal minefield: the EULA specifies that the -# Board Support Package includes software and hardware (sic!) for -# which a separate license is needed... -# -# $(1): full path to the archive file -# -define FREESCALE_IMX_EXTRACT_HELPER - awk 'BEGIN { start = 0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(@D) && sh $(1) --force --auto-accept - find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; - rmdir $(@D)/$(basename $(notdir $(1))) -endef - include $(sort $(wildcard package/freescale-imx/*/*.mk)) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6ece27baa2..57f4af04c5 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -275,3 +275,28 @@ legal-deps = \ $(filter-out $(if $(1:host-%=),host-%),\ $(call non-virtual-deps,\ $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)]) + +# Helper for self-extracting binaries distributed by Freescale. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define FREESCALE_IMX_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef From 721d3c6e802b8f97e133b2974cbf615dd00a1e80 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Aug 2022 18:56:31 +0200 Subject: [PATCH 028/140] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER The Freescale extract helper was introduced before Freescale was part of NXP. Nowadays, we also have NXP packages, and they do use the same archiving format. Rename the helper under the now more generic NXP name, so that it is more logical to also use it for NXP packages. We do not retain the old Freescale-based name, because we should no longer add Freescale-named packages; they would most probably be introduced under the NXP name. Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: - provide the rationale in the commit log - keep referring to Freescale in comment ] Signed-off-by: Yann E. MORIN --- package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk | 2 +- package/freescale-imx/imx-codec/imx-codec.mk | 2 +- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 2 +- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 2 +- package/freescale-imx/imx-parser/imx-parser.mk | 2 +- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk | 2 +- package/freescale-imx/imx-seco/imx-seco.mk | 2 +- package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk | 2 +- package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk | 2 +- package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +- package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk | 2 +- package/freescale-imx/libz160/libz160.mk | 2 +- package/pkg-utils.mk | 5 +++-- 14 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 47c21585aa..4884079d5c 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -15,7 +15,7 @@ FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_INSTALL_IMAGES = YES define FIRMWARE_IMX_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef # diff --git a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk index c99c568f73..895fedc2e1 100644 --- a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk +++ b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk @@ -23,7 +23,7 @@ GPU_AMD_BIN_MX51_LICENSE_FILES = EULA GPU_AMD_BIN_MX51_REDISTRIBUTE = NO define GPU_AMD_BIN_MX51_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) endef # Upstream headers need to be compiled with -D_LINUX. It is more convenient diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 1ec701d2f1..2b7c346a6e 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -26,7 +26,7 @@ IMX_CODEC_CONF_OPTS += --enable-vpu endif define IMX_CODEC_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE)) endef # FIXME The Makefile installs both the arm9 and arm11 versions of the 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 0e4078a962..c5df87e618 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -19,7 +19,7 @@ IMX_GPU_G2D_LICENSE_FILES = EULA COPYING IMX_GPU_G2D_REDISTRIBUTE = NO define IMX_GPU_G2D_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) endef define IMX_GPU_G2D_INSTALL_STAGING_CMDS 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 1d76d79e2b..63d5d3c2ea 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -44,7 +44,7 @@ IMX_GPU_VIV_DEPENDENCIES += wayland endif define IMX_GPU_VIV_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) endef ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk index fc4376f04b..dccb8829d2 100644 --- a/package/freescale-imx/imx-parser/imx-parser.mk +++ b/package/freescale-imx/imx-parser/imx-parser.mk @@ -24,7 +24,7 @@ IMX_PARSER_CONF_OPTS += --enable-fsw endif define IMX_PARSER_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE)) endef # The Makefile installs several versions of the libraries, but we only 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 bbb7310306..6a304c0c8c 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -13,7 +13,7 @@ IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING IMX_SC_FIRMWARE_REDISTRIBUTE = NO define IMX_SC_FIRMWARE_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE)) endef IMX_SC_FIRMWARE_INSTALL_IMAGES = YES diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 79c9722c43..987f24658d 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -13,7 +13,7 @@ IMX_SECO_LICENSE_FILES = EULA COPYING IMX_SECO_REDISTRIBUTE = NO define IMX_SECO_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE)) endef IMX_SECO_INSTALL_IMAGES = YES 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 b07e116674..5f4c6faee4 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 @@ -14,7 +14,7 @@ IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING IMX_VPU_HANTRO_VC_REDISTRIBUTE = NO define IMX_VPU_HANTRO_VC_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE)) endef define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS 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 360591b444..9d34c7add7 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -23,7 +23,7 @@ IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING IMX_VPU_HANTRO_REDISTRIBUTE = NO define IMX_VPU_HANTRO_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE)) endef define IMX_VPU_HANTRO_BUILD_CMDS diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index 14a1a7a9f0..cae3d88b6d 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -21,7 +21,7 @@ IMX_VPU_LICENSE_FILES = EULA COPYING IMX_VPU_REDISTRIBUTE = NO define IMX_VPU_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE)) endef define IMX_VPU_BUILD_CMDS diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk index 4f89165403..4bee1cf642 100644 --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk @@ -22,7 +22,7 @@ IMX_VPUWRAP_LICENSE_FILES = EULA COPYING IMX_VPUWRAP_REDISTRIBUTE = NO define IMX_VPUWRAP_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE)) endef $(eval $(autotools-package)) diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk index 5b1feeb441..a15b5f6b60 100644 --- a/package/freescale-imx/libz160/libz160.mk +++ b/package/freescale-imx/libz160/libz160.mk @@ -15,7 +15,7 @@ LIBZ160_LICENSE_FILES = EULA LIBZ160_REDISTRIBUTE = NO define LIBZ160_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE)) endef define LIBZ160_INSTALL_STAGING_CMDS diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 57f4af04c5..0945e6ed31 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -276,7 +276,8 @@ legal-deps = \ $(call non-virtual-deps,\ $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)]) -# Helper for self-extracting binaries distributed by Freescale. +# Helper for self-extracting binaries distributed by NXP, and +# formerlly Freescale. # # The --force option makes sure it doesn't fail if the source # directory already exists. The --auto-accept skips the license check, @@ -290,7 +291,7 @@ legal-deps = \ # # $(1): full path to the archive file # -define FREESCALE_IMX_EXTRACT_HELPER +define NXP_EXTRACT_HELPER awk 'BEGIN { start = 0; } \ /^EOEULA/ { start = 0; } \ { if (start) print; } \ From 3b5e02c4958e11b28ee359f908cbf464b6964fff Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Aug 2022 18:56:32 +0200 Subject: [PATCH 029/140] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- .../qoriq-cadence-dp-firmware.mk | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk index 23643d24e0..6bfb921628 100644 --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk @@ -13,33 +13,8 @@ QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO -# Helper for self-extracting binaries distributed by NXP. -# -# The --force option makes sure it doesn't fail if the source -# directory already exists. The --auto-accept skips the license check, -# as it is not needed in Buildroot because we have legal-info. Since -# there's a EULA in the binary file, we extract it in this macro, and -# it should therefore be added to the LICENSE_FILES variable of -# packages using this macro. Also, remember to set REDISTRIBUTE to -# "NO". Indeed, this is a legal minefield: the EULA specifies that the -# Board Support Package includes software and hardware (sic!) for -# which a separate license is needed... -# -# $(1): full path to the archive file -# -define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER - awk 'BEGIN { start = 0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(@D) && sh $(1) --force --auto-accept - find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; - rmdir $(@D)/$(basename $(notdir $(1))) -endef - define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS - $(call QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) endef define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS From 12d16f037b5e30ce2420df54245d9a47b90aabd1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2022 18:48:10 +0200 Subject: [PATCH 030/140] package/lshw: add sqlite optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lshw/lshw.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index bf286647b6..bde23d1499 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -22,6 +22,13 @@ LSHW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ LIBS=$(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_SQLITE),y) +LSHW_DEPENDENCIES += host-pkgconf sqlite +LSHW_MAKE_OPTS += SQLITE=1 +else +LSHW_MAKE_OPTS += SQLITE=0 +endif + define LSHW_BUILD_CMDS $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src \ $(LSHW_MAKE_OPTS) \ From 169943e8d9170917e0f9f65177e1d9a497d691ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2022 18:48:11 +0200 Subject: [PATCH 031/140] package/lshw: add zlib optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lshw/lshw.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index bde23d1499..86c8f356cc 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -29,6 +29,13 @@ else LSHW_MAKE_OPTS += SQLITE=0 endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LSHW_DEPENDENCIES += host-pkgconf zlib +LSHW_MAKE_OPTS += ZLIB=1 +else +LSHW_MAKE_OPTS += ZLIB=0 +endif + define LSHW_BUILD_CMDS $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src \ $(LSHW_MAKE_OPTS) \ From 54e033785cfead216db256d2dc3389b2486806f4 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 11 Aug 2022 11:52:22 +0200 Subject: [PATCH 032/140] package/boost: bump to version 1.80.0 - drop upstreamed patches Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- .../0001-json-array-erase-relocate.patch | 65 ------------------- ...ips1-to-mips-and-alias-mips1-to-mips.patch | 48 -------------- package/boost/boost.hash | 4 +- package/boost/boost.mk | 2 +- 4 files changed, 3 insertions(+), 116 deletions(-) delete mode 100644 package/boost/0001-json-array-erase-relocate.patch delete mode 100644 package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch diff --git a/package/boost/0001-json-array-erase-relocate.patch b/package/boost/0001-json-array-erase-relocate.patch deleted file mode 100644 index 899b202279..0000000000 --- a/package/boost/0001-json-array-erase-relocate.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 07d7c3b2e0f8c6b269ba167117cd3e549df2f342 Mon Sep 17 00:00:00 2001 -From: Vinnie Falco -Date: Wed, 13 Apr 2022 05:49:05 -0700 -Subject: [PATCH] array::erase relocates correctly - -fix #692 - -Signed-off-by: Michael Nosthoff -[Upstream status: https://github.com/boostorg/json/issues/692] ---- - boost/json/impl/array.ipp | 5 ++++- - test/array.cpp | 16 ++++++++++++++++ - 2 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/boost/json/impl/array.ipp b/boost/json/impl/array.ipp -index 4d067fb5..a2c7fd6d 100644 ---- a/boost/json/impl/array.ipp -+++ b/boost/json/impl/array.ipp -@@ -491,8 +491,11 @@ erase( - auto const p = &(*t_)[0] + - (pos - &(*t_)[0]); - destroy(p, p + 1); -- relocate(p, p + 1, 1); - --t_->size; -+ if(t_->size > 0) -+ relocate(p, p + 1, -+ t_->size - (p - -+ &(*t_)[0])); - return p; - } - -diff --git a/libs/json/test/array.cpp b/libs/json/test/array.cpp -index 1cc87566..4516cc78 100644 ---- a/libs/json/test/array.cpp -+++ b/libs/json/test/array.cpp -@@ -1269,6 +1269,21 @@ class array_test - array{nullptr, "a", "b"})); - } - -+ void -+ testIssue692() -+ { -+ array a; -+ object obj; -+ obj["test1"] = "hello"; -+ a.push_back(obj); -+ a.push_back(obj); -+ a.push_back(obj); -+ a.push_back(obj); -+ a.push_back(obj); -+ while(a.size()) -+ a.erase(a.begin()); -+ } -+ - void - run() - { -@@ -1283,6 +1298,7 @@ class array_test - testExceptions(); - testEquality(); - testHash(); -+ testIssue692(); - } - }; - diff --git a/package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch b/package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch deleted file mode 100644 index cc4ab8a2f8..0000000000 --- a/package/boost/0002-Rename-mips1-to-mips-and-alias-mips1-to-mips.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1a55d1d9c6d1cf7739645080bdd92fe903b4211e Mon Sep 17 00:00:00 2001 -From: Nikita Kniazev -Date: Wed, 28 Jul 2021 21:06:54 +0300 -Subject: [PATCH] Rename mips1 to mips and alias mips1 to mips - -[Retrieved from: -https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e] -Signed-off-by: Fabrice Fontaine ---- - checks/architecture/Jamfile.jam | 3 ++- - checks/architecture/{mips1.cpp => mips.cpp} | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - rename checks/architecture/{mips1.cpp => mips.cpp} (89%) - -diff --git a/libs/config/checks/architecture/Jamfile.jam b/libs/config/checks/architecture/Jamfile.jam -index 2ba54f9ad..c3779d917 100644 ---- a/libs/config/checks/architecture/Jamfile.jam -+++ b/libs/config/checks/architecture/Jamfile.jam -@@ -18,7 +18,8 @@ obj 64 : 64.cpp ; - - obj arm : arm.cpp ; - obj combined : combined.cpp ; --obj mips1 : mips1.cpp ; -+obj mips : mips.cpp ; -+alias mips1 : mips ; # Backwards compatibility - obj power : power.cpp ; - obj riscv : riscv.cpp ; - obj sparc : sparc.cpp ; -diff --git a/libs/config/checks/architecture/mips1.cpp b/libs/config/checks/architecture/mips.cpp -similarity index 89% -rename from checks/architecture/mips1.cpp -rename to checks/architecture/mips.cpp -index b4a670b89..85f85583d 100644 ---- a/libs/config/checks/architecture/mips1.cpp -+++ b/libs/config/checks/architecture/mips.cpp -@@ -1,4 +1,4 @@ --// mips1.cpp -+// mips.cpp - // - // Copyright (c) 2012 Steven Watanabe - // -@@ -7,5 +7,5 @@ - // http://www.boost.org/LICENSE_1_0.txt) - - #if !(defined(__mips) || defined(_MIPS_ISA_MIPS1) || defined(_R3000)) --#error "Not MIPS1" -+#error "Not MIPS" - #endif diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 0f46befc0c..ab54a4b2fc 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_79_0.html -sha256 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 boost_1_79_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_80_0.html +sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 557c260693..bd1d329982 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.79.0 +BOOST_VERSION = 1.80.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES From 4057e36ca9665edd5248512e4edba2c243b8f4be Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Aug 2022 22:29:55 +0200 Subject: [PATCH 033/140] toolchain/toolchain-buildroot: default to glibc as the C library This is perhaps the most controversial change for Buildroot that can be written in a two-liner. Historically, we have used uClibc as our default C library, as Buildroot was created initially as a test-bed for uClibc, and also because uClibc made a lot of sense for embedded Linux systems, due to its smaller size and fine-grained configurability. Since then, the landscape of embedded Linux systems has changed. Even though Buildroot happily supports really low-end devices, the vast majority of Buildroot users are quite certainly running the resulting system on a reasonably powerful platform, with significant amount of RAM and storage. In this context, the benefits of uClibc are no longer that much relevant, and glibc causes less "troubles". Therefore, this patch proposes to use glibc as our default C library when using the internal toolchain backend instead of uClibc. Of course, we will keep the support for uClibc, which remains an important C library choice, for space-constrained systems, or simply for architectures that are not supported by glibc. Signed-off-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Yann E. MORIN Acked-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- toolchain/toolchain-buildroot/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 836af3b22a..9956dc4383 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -22,8 +22,7 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR choice prompt "C library" - default BR2_TOOLCHAIN_BUILDROOT_UCLIBC - default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_powerpc64 + default BR2_TOOLCHAIN_BUILDROOT_GLIBC config BR2_TOOLCHAIN_BUILDROOT_UCLIBC bool "uClibc-ng" From de34ba06c568e06f95f5d4c4ee1b673669c95b68 Mon Sep 17 00:00:00 2001 From: Nicola Di Lieto Date: Mon, 15 Aug 2022 22:43:44 +0200 Subject: [PATCH 034/140] package/uacme: bump version to 1.7.2 Signed-off-by: Nicola Di Lieto Signed-off-by: Yann E. MORIN --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 4ae85c1c5c..f62463029a 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 36027a587256cbaa86650cec2a5b3eb000480e1150bd83941565661b392625ac uacme-1.7.1.tar.gz +sha256 e7598e794f5ec414d993c4f2f7df39e7c72f26e41302b875ddaf040d8103ec5f uacme-1.7.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index 2be96d534e..f38251c87a 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.1 +UACME_VERSION = 1.7.2 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version From 87f4900826bd4387a098fdb9a003e66a0ca057c8 Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Mon, 15 Aug 2022 13:17:08 +0200 Subject: [PATCH 035/140] package/dracut: new host package Dracut is the tool used by desktop distributions to build initrds. In the embedded world, it can be very useful, too, for instance when wanting to create an initramfs for a system recovery mode. Whereas it is definitively possible to achieve this with buildroot, the process is to have a dedicated buildroot configuration for that, and perform a full build. Instead of doing that, dracut can pick the needed binaries/shared libraries, configuration files, or kernel modules from the 'target' directory. The advantage is to save build time, and also to have a consistency between the packages versions taken for the recovery and the production filesystem. The principle of dracut is based on the so-called 'dracut modules'. The modules determine what will be included in the initramfs. For example, one of dracut's modules checks the kernel modules that are included and also includes the corresponding firmware blobs. On the host, they are on host/lib/dracut/modules.d Each directory as a prefix number for the order of execution, and at least a "module-setup.sh" script. Dracut sources all of them, and typically calls the "check()" function, which is the placeholder for required binaries (that are aimed to be polulated in the initrd), then the "depends()" function, that lists other modules to depend on, and the "install()" function, that makes the actual work. Dracut was initially thought to work with systems using systemd, but it can also work without it. Do to so, every "systemd-xxx" module must be disabled in the dracut configuration file. For convenience, the 05busybox-init module is provided, to support busybox init system. Note that this module should *not* be enabled when using systemd init. It is therefore only installed if busybox init is selected. Musl and uClibc make assumptions about the existence of some symlinks that are not discoverable with readelf. Therefore, another module 05libc-links is provided that creates those links. The module is installed regardless of which libc is used - the script itself discovers if the links need to be installed based on which libc is found. Signed-off-by: Thierry Bultel [arnout@mind.be: many changes] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett [yann.morin.1998@free.fr: some additional fixups] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 + package/Config.in.host | 1 + ...001-dracut.sh-don-t-unset-LD_PRELOAD.patch | 31 ++++++++++ package/dracut/Config.in.host | 9 +++ package/dracut/busybox-init-module-setup.sh | 59 +++++++++++++++++++ package/dracut/dracut.hash | 3 + package/dracut/dracut.mk | 48 +++++++++++++++ package/dracut/dracut_wrapper | 38 ++++++++++++ package/dracut/libc-links-module-setup.sh | 27 +++++++++ 9 files changed, 218 insertions(+) create mode 100644 package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch create mode 100644 package/dracut/Config.in.host create mode 100644 package/dracut/busybox-init-module-setup.sh create mode 100644 package/dracut/dracut.hash create mode 100644 package/dracut/dracut.mk create mode 100644 package/dracut/dracut_wrapper create mode 100755 package/dracut/libc-links-module-setup.sh diff --git a/DEVELOPERS b/DEVELOPERS index d2bd0d809a..4287fd9cf7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -225,6 +225,7 @@ F: package/espeak/ N: Arnout Vandecappelle F: package/arp-scan/ F: package/dehydrated/ +F: package/dracut/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ F: package/libpagekite/ @@ -2796,6 +2797,7 @@ F: configs/beagleboardx15_defconfig F: package/pugixml/ N: Thierry Bultel +F: package/dracut/ F: package/mpd-mpc/ N: Thijs Vermeir diff --git a/package/Config.in.host b/package/Config.in.host index 99edeafece..f437ef680c 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -19,6 +19,7 @@ menu "Host utilities" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" source "package/doxygen/Config.in.host" + source "package/dracut/Config.in.host" source "package/dtc/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/e2tools/Config.in.host" diff --git a/package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch b/package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch new file mode 100644 index 0000000000..394917eeb0 --- /dev/null +++ b/package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch @@ -0,0 +1,31 @@ +From bb12f15856911d8532b569116da7dab4cbf107be Mon Sep 17 00:00:00 2001 +From: Thierry Bultel +Date: Mon, 10 Jan 2022 09:09:43 +0100 +Subject: [PATCH] dracut.sh: don't unset LD_PRELOAD + +LD_PRELOAD and LD_LIBRARY_PATH are needed to run under fakeroot. + +Signed-off-by: Thierry Bultel +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +[yann.morin.1998@free.fr: commit log also mentions LD_LIBRARY_PATH] +Signed-off-by: Yann E. MORIN +--- + dracut.sh | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 60ac46f4..37f25b38 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -868,8 +868,6 @@ export LC_ALL=C + export LANG=C + unset LC_MESSAGES + unset LC_CTYPE +-unset LD_LIBRARY_PATH +-unset LD_PRELOAD + unset GREP_OPTIONS + + export DRACUT_LOG_LEVEL=warning +-- +2.37.1 + diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host new file mode 100644 index 0000000000..18f562b310 --- /dev/null +++ b/package/dracut/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_DRACUT + bool + select BR2_PACKAGE_HOST_KMOD + help + dracut is used to create an initramfs image by + copying tools and files from an installed system + and combining it with the dracut framework. + + https://dracut.wiki.kernel.org diff --git a/package/dracut/busybox-init-module-setup.sh b/package/dracut/busybox-init-module-setup.sh new file mode 100644 index 0000000000..d6ea94350f --- /dev/null +++ b/package/dracut/busybox-init-module-setup.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +check() { + require_binaries busybox || return 1 + return 0 +} + +depends() { + return 0 +} + +install_busybox_links() { + dir="${1}" + linkname="${2}" + + (cd "${dracutsysrootdir?}${dir}" && + for x in *; do + if [ "$(readlink "${x}")" = "${linkname}" ]; then + ln -sf "${linkname}" "${initdir?}/${dir}/${x}" + fi + done + ) +} + +install() { + inst_multiple /bin/busybox + + # wrapper script for early console; will launch /sbin/init + # after having mounted devtmpfs + inst_multiple /init + + if [ -e "${dracutsysrootdir?}/lib64" ]; then + ln -sf lib "${initdir?}/lib64" + ln -sf lib "${initdir?}/usr/lib64" + fi + + if [ -e "${dracutsysrootdir?}/lib32" ]; then + ln -sf lib "${initdir?}/lib32" + ln -sf lib "${initdir?}/usr/lib32" + fi + + install_busybox_links "/bin" "busybox" + install_busybox_links "/sbin" "../bin/busybox" + if [ ! -L "${dracutsysrootdir?}/bin" ]; then + install_busybox_links "/usr/bin" "../../bin/busybox" + install_busybox_links "/usr/sbin" "../../bin/busybox" + fi + + inst_multiple \ + /etc/inittab \ + /etc/init.d/rcS \ + /etc/init.d/rcK \ + /etc/issue \ + /etc/fstab \ + /etc/group \ + /etc/passwd \ + /etc/shadow \ + /etc/hostname +} diff --git a/package/dracut/dracut.hash b/package/dracut/dracut.hash new file mode 100644 index 0000000000..3cda736856 --- /dev/null +++ b/package/dracut/dracut.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4baa08206cceeb124dbf1075a0daf774b5a8f144ce2e01d82a144af3020fd65b dracut-055.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk new file mode 100644 index 0000000000..2b6a144aac --- /dev/null +++ b/package/dracut/dracut.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# dracut +# +################################################################################ + +DRACUT_VERSION = 055 +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut +DRACUT_LICENSE = GPL-2.0 +DRACUT_LICENSE_FILES = COPYING + +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross + +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + mv $(HOST_DIR)/bin/dracut $(HOST_DIR)/bin/dracut.real + install -D -m 0755 $(HOST_DRACUT_PKGDIR)/dracut_wrapper \ + $(HOST_DIR)/bin/dracut +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + +# When using uClibc or musl, there must be "ld-uClibc.so.1" or +# "ld-musl-x.so" symlinks, respectively - else the init process cannot +# start +define HOST_DRACUT_POST_INSTALL_LIBC_LINKS_MODULE + $(INSTALL) -D -m 0755 package/dracut/libc-links-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05libc-links/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_LIBC_LINKS_MODULE + +ifeq ($(BR2_INIT_BUSYBOX),y) +# Dracut does not support busybox init (systemd init is assumed to work +# out of the box, though). It provides a busybox module, that does not +# use the same paths as buildroot, and is not meant to be used as an init +# system. +# So it is simpler for users to disable the standard 'busybox' module in +# the configuration file, and enable the "busybox-init' module instead. +# Note that setting the script as executable (0755) is not mandatory, +# but this is what dracut does on all its modules, so lets just conform +# to it. +define HOST_DRACUT_POST_INSTALL_BUSYBOX_INIT_MODULE + $(INSTALL) -D -m 0755 package/dracut/busybox-init-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05busybox-init/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_INIT_MODULE +endif + +$(eval $(host-autotools-package)) diff --git a/package/dracut/dracut_wrapper b/package/dracut/dracut_wrapper new file mode 100644 index 0000000000..0464db17fe --- /dev/null +++ b/package/dracut/dracut_wrapper @@ -0,0 +1,38 @@ +#!/bin/bash +set -e + +# Find the --sysroot argument +sysroot= +next_arg=false +for arg; do + if ${next_arg}; then + next_arg=false + sysroot="${arg}" + continue # not break, in case there are more than one + fi + case "${arg}" in + (--sysroot|-r) + next_arg=true + continue + ;; + (--sysroot=*) + sysroot="${arg#*=}" + continue # not break, in case there are more than one + ;; + (-r?*) + sysroot="${arg#-r}" + continue # not break, in case there are more than one + ;; + esac +done +if [ -z "${sysroot}" ]; then + echo "${0}: --sysroot argument must be given." 1>&2 + exit 1 +fi + +topdir="$(dirname "$(realpath "$(dirname "${0}")")")" +export DRACUT_LDD="${topdir}/sbin/prelink-rtld --root='${sysroot}'" +export DRACUT_INSTALL="${topdir}/lib/dracut/dracut-install" +export DRACUT_LDCONFIG=/bin/true +export dracutbasedir="${topdir}/lib/dracut" +exec "${topdir}/bin/dracut.real" "${@}" diff --git a/package/dracut/libc-links-module-setup.sh b/package/dracut/libc-links-module-setup.sh new file mode 100755 index 0000000000..26ebc5bc84 --- /dev/null +++ b/package/dracut/libc-links-module-setup.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# Adds the missing links for uClibc or musl, if needed + +check() { + return 0 +} + +depends() { + return 0 +} + +install() { + # Despite of the fact that the listed dependency (reported by readelf -d) + # is purely /lib/libc.so, the musl symlink is needed anyway. + musl_link="$(find "${dracutsysrootdir?}/lib/" -name "ld-musl-*.so*")" + if [ -n "${musl_link}" ] ; then + ln -s libc.so "${initdir?}/lib/${musl_link##*/}" + fi + + # Same for uClibc, the listed dependency + # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too + uclibc_link="$(find "${dracutsysrootdir?}/lib/" -name "ld-uClibc-*.so*")" + if [ -n "$uclibc_link" ] ; then + ln -s ld-uClibc.so.1 "${initdir?}/lib/ld-uClibc.so.0" + fi +} From d8f0ec7a468c30d401b2e51e4bbfe985997f8e0c Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Mon, 15 Aug 2022 13:17:09 +0200 Subject: [PATCH 036/140] fs/cpio: new option to use dracut tool Adds an option to invoke the dracut host tool, providing a configuration file, instead of having a full cpio archive of the whole target directory. A default configuration file is provided. It assumes busybox init. ideally, a different default should be used in case of systemd init, but that's left for future work. Signed-off-by: Thierry Bultel [arnout@mind.be: many changes] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [yann.morin.1998@free.fr: some additional fixups] Signed-off-by: Yann E. MORIN --- fs/cpio/Config.in | 35 +++++++++++++++++ fs/cpio/cpio.mk | 33 ++++++++++++++++ fs/cpio/dracut.conf | 92 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 fs/cpio/dracut.conf diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index c1151a2881..861e9a929e 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -7,6 +7,41 @@ config BR2_TARGET_ROOTFS_CPIO if BR2_TARGET_ROOTFS_CPIO +choice + prompt "cpio type" + default BR2_TARGET_ROOTFS_CPIO_FULL + +config BR2_TARGET_ROOTFS_CPIO_FULL + bool "cpio the whole root filesystem" + help + Build a cpio archive containing the whole the root filesystem. + +config BR2_TARGET_ROOTFS_CPIO_DRACUT + bool "Invoke dracut to make a partial initramfs" + select BR2_PACKAGE_HOST_DRACUT + help + Build an additional initramfs using dracut. This only contains + a subset of the rootfs, as determined by the configuration + file. + This can be useful to create a recovery system, for instance. + +endchoice + +if BR2_TARGET_ROOTFS_CPIO_DRACUT + +config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE + string "dracut configuration file" + default "fs/cpio/dracut.conf" + help + Dracut configuration file. It determines which parts of the + rootfs get included in the cpio image. See dracut.conf(5) or + https://github.com/dracutdevs/dracut/blob/master/man/dracut.conf.5.asc + + The default configuration file is suitable for busybox init. + It doesn't, however, pivot_root into a full rootfs. + +endif + choice prompt "Compression method" default BR2_TARGET_ROOTFS_CPIO_NONE diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 81f8c393d1..fa66b1c710 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -36,6 +36,8 @@ ROOTFS_CPIO_DEPENDENCIES += host-cpio ROOTFS_CPIO_OPTS += --reproducible endif +ifeq ($(BR2_TARGET_ROOTFS_CPIO_FULL),y) + define ROOTFS_CPIO_CMD cd $(TARGET_DIR) && \ find . \ @@ -44,6 +46,37 @@ define ROOTFS_CPIO_CMD > $@ endef +else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) + +ROOTFS_CPIO_DEPENDENCIES += host-dracut + +ROOTFS_CPIO_DRACUT_CONF_FILE = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE)) +ifeq ($(BR_BUILDING):$(ROOTFS_CPIO_DRACUT_CONF_FILE),y:) +$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE setting) +endif + +ifeq ($(BR2_LINUX_KERNEL),y) +ROOTFS_CPIO_DEPENDENCIES += linux +ROOTFS_CPIO_OPTS += --kver $(LINUX_VERSION_PROBED) +else +ROOTFS_CPIO_OPTS += --no-kernel +endif + +define ROOTFS_CPIO_CMD + mkdir -p $(ROOTFS_CPIO_DIR)/tmp + $(HOST_DIR)/bin/dracut \ + $(ROOTFS_CPIO_OPTS) \ + -c $(ROOTFS_CPIO_DRACUT_CONF_FILE) \ + --sysroot $(TARGET_DIR) \ + --tmpdir $(ROOTFS_CPIO_DIR)/tmp \ + -M \ + --force \ + --no-compress \ + $@ +endef + +endif #BR2_TARGET_ROOTFS_CPIO_DRACUT + ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools define ROOTFS_CPIO_UBOOT_MKIMAGE diff --git a/fs/cpio/dracut.conf b/fs/cpio/dracut.conf new file mode 100644 index 0000000000..2337736c4e --- /dev/null +++ b/fs/cpio/dracut.conf @@ -0,0 +1,92 @@ +#Simple dracut config for a system without systemd + +#Dracut configuration + +show_modules=yes +i18n_install_all=no +lvmconf=no +mdadmconf=no +early_microcode=no +hostonly=no +hostonly_cmdline=no +use_fstab=no +kernel_cmdline="rd.break=initqueue" +do_strip=no + +# Dracut modules needed +add_dracutmodules+=" \ +busybox-init +" + +# Modules to ignore +omit_dracutmodules+=" \ +bash \ +biosdevname \ +btrfs \ +bluetooth \ +busybox \ +caps \ +cifs \ +crypt \ +crypt-gpg \ +dash \ +dbus-broker \ +dbus-daemon \ +dm \ +dmraid \ +dmsquash-live-ntfs \ +dracut-systemd \ +fcoe \ +fcoe-uefi \ +fs-lib \ +iscsi \ +i18n \ +lvmmerge \ +lvm \ +lunmask \ +mdraid \ +memstrack \ +mksh \ +modsign \ +mount-root \ +multipath \ +nbd \ +network-legacy \ +network-wicked \ +nfs \ +nvdimm \ +nvmf \ +parse-lunmask \ +qemu \ +qemu-net \ +resume \ +rootfs-block \ +rngd \ +systemd \ +systemd-udevd \ +systemd-coredump \ +systemd-ask-password \ +systemd-timedated \ +systemd-rfkill \ +systemd-resolved \ +systemd-hostnamed \ +systemd-initrd \ +systemd-journald \ +systemd-ldconfig \ +systemd-networkd \ +systemd-timesyncd \ +systemd-veritysetup \ +systemd-modules-load \ +systemd-sysctl \ +systemd-repart \ +systemd-sysext \ +systemd-sysusers \ +systemd-tmpfiles \ +squash \ +ssh-client \ +stratis \ +tpm2-tss \ +udev-rules \ +url-lib \ +usrmount \ +" From bd0b2db23154f700fbb94aa3a0a0752a52b5ea7b Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Mon, 15 Aug 2022 13:17:10 +0200 Subject: [PATCH 037/140] support/testing/tests/fs/test_cpio.py: new runtime test It includes a simple test for the full cpio image, and a test of the dracut image. To validate that the dracut image is a subset of the full image, 'pv' is added to the image, and the test verifies that pv is not part of the image. Note that the real rootfs is not mounted at the moment, so pv is never available in the running image. Systemd and other init systems are currently untested. Signed-off-by: Thierry Bultel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- support/testing/tests/fs/test_cpio.py | 125 ++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 support/testing/tests/fs/test_cpio.py diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py new file mode 100644 index 0000000000..3f661e370c --- /dev/null +++ b/support/testing/tests/fs/test_cpio.py @@ -0,0 +1,125 @@ +import os +import infra.basetest +import subprocess + +CHECK_FS_CMD = "mount | grep 'rootfs on / type rootfs'" + + +def boot_img(emulator, builddir): + img = os.path.join(builddir, "images", "rootfs.cpio") + emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", "{}".format(img)]) + emulator.login() + _, exit_code = emulator.run(CHECK_FS_CMD) + return exit_code + + +class TestCpioFull(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_INIT_BUSYBOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + + +class TestCpioDracutBase(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_INIT_BUSYBOX=y + BR2_PACKAGE_PV=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_DRACUT=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def check_dracut(self): + out = subprocess.check_output(["cpio", "--list"], + stdin=open(os.path.join(self.builddir, "images/rootfs.cpio")), + stderr=open(os.devnull, "w"), + cwd=self.builddir, + env={"LANG": "C"}, + universal_newlines=True) + # pv should *not* be included in cpio image + self.assertEqual(out.find("bin/pv"), -1) + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + + # No pivot_root is done, so pv shouldn't be there + _, exit_code = self.emulator.run("ls -l /usr/bin/pv") + self.assertNotEqual(exit_code, 0) + + +class TestCpioDracutUclibc(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutGlibc(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutMusl(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutUclibcMergedUsr(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_ROOTFS_MERGED_USR=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutGlibcMergedUsr(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_ROOTFS_MERGED_USR=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutMuslMergedUsr(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_ROOTFS_MERGED_USR=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE=y + """ + + def test_run(self): + self.check_dracut() From 35b3a646e0ae44b9a4428dcedce22a61967a2384 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 18 Aug 2022 23:33:29 +0200 Subject: [PATCH 038/140] package/docker-engine: use kernel modules for extra network drivers Docker network driver "overlay", "macvlan" and "ipvlan" are not used by default. Don't force enable them in the kernel. The main aim here is to get rid of the dummy0 network interface which is generated by the dummy driver by default. Signed-off-by: Stefan Agner Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 293af1858c..fb489c0f8d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -124,10 +124,6 @@ define DOCKER_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_IPVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) From 8bba793456fe887c81a6198fedc9ea8fceb59a74 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 17 Aug 2022 23:37:23 +0200 Subject: [PATCH 039/140] package/linux-backports: bump version to 5.10.110 Note: This is not the latest package version to date. This is the latest linux-backports version which is not changing the minimal kernel version requirement, which is kept to kernels version >= 3.10. For commit log details, see: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/log/?h=v5.10.110-1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/linux-backports/linux-backports.hash | 4 ++-- package/linux-backports/linux-backports.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index 3e103424f5..83a3e54cd7 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,5 +1,5 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.8/sha256sums.asc -sha256 19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b backports-5.8-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.10.110/sha256sums.asc +sha256 3d958154080c059adaf26512430fd1a8888d65a2228e5e70e48d028201e148b1 backports-5.10.110-1.tar.xz # Locally computed sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 068dcffcc8..a39891336d 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 5.8 +LINUX_BACKPORTS_VERSION_MAJOR = 5.10.110 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) From ef89aa4b98b3fce22c1b7d437451090d6178c1e8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 17 Aug 2022 23:37:24 +0200 Subject: [PATCH 040/140] package/linux-backports: add version 5.15.58 This commit add a new package version, while keeping the previous one. This was suggested in: https://lists.buildroot.org/pipermail/buildroot/2022-August/649398.html This is because linux-backports increased its minimal requirements on kernel version. Since Buildroot want to support a wide range of kernel versions, this package now supports several backport versions, one for each kernel version era (backports v5.10.110 for kernels down to version 3.10, backports v5.15.58 for kernels down to version 4.4). For detailed release commit log, see: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/log/?h=v5.15.58-1 Signed-off-by: Julien Olivain [yann.morin.1998@free.fr: split long lines] Signed-off-by: Yann E. MORIN --- package/linux-backports/Config.in | 17 +++++++++--- package/linux-backports/linux-backports.hash | 2 ++ package/linux-backports/linux-backports.mk | 27 ++++++++++++++++---- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/package/linux-backports/Config.in b/package/linux-backports/Config.in index 251d202fd2..a434d0042b 100644 --- a/package/linux-backports/Config.in +++ b/package/linux-backports/Config.in @@ -8,13 +8,24 @@ config BR2_PACKAGE_LINUX_BACKPORTS The linux-backports package includes many Linux drivers from recent kernels, backported to older ones. - This version of linux-backports supports kernels starting - from 3.10. - https://backports.wiki.kernel.org if BR2_PACKAGE_LINUX_BACKPORTS +choice + prompt "Linux Backports version" + default BR2_PACKAGE_LINUX_BACKPORTS_5_15_X + help + Select the highest version that supports your kernel version. + +config BR2_PACKAGE_LINUX_BACKPORTS_5_15_X + bool "5.15.x (for kernels back to 4.4)" + +config BR2_PACKAGE_LINUX_BACKPORTS_5_10_X + bool "5.10.x (for kernels back to 3.10)" + +endchoice + choice prompt "Linux kernel driver backports configuration" default BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index 83a3e54cd7..ce4278dffa 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,5 +1,7 @@ # From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.10.110/sha256sums.asc sha256 3d958154080c059adaf26512430fd1a8888d65a2228e5e70e48d028201e148b1 backports-5.10.110-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.15.58/sha256sums.asc +sha256 a3c2a2b7bbaf8943c65fd72f4e7d7ad5e205aeae28b26c835f9d8afa0f9810bf backports-5.15.58-1.tar.xz # Locally computed sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index a39891336d..8513a84487 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,7 +4,17 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_5_10_X),y) LINUX_BACKPORTS_VERSION_MAJOR = 5.10.110 +LINUX_BACKPORTS_MINIMAL_KVER_MAJOR = 3 +LINUX_BACKPORTS_MINIMAL_KVER_MINOR = 10 +else +# use default the latest version as default +LINUX_BACKPORTS_VERSION_MAJOR = 5.15.58 +LINUX_BACKPORTS_MINIMAL_KVER_MAJOR = 4 +LINUX_BACKPORTS_MINIMAL_KVER_MINOR = 4 +endif + LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) @@ -93,8 +103,8 @@ $(eval $(kconfig-package)) # can't use it as a stamp file. We use the LINUX_KCONFIG_STAMP_DOTCONFIG # instead. # -# Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.10. To avoid overriding linux-backports' +# Furthermore, we want to check the kernel version is compatible with +# linux-backports. To avoid overriding linux-backports' # KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we # use an intermediate stamp-file. # @@ -107,11 +117,18 @@ $(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKP .SECONDEXPANSION: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) $(Q)KVER=$(LINUX_VERSION_PROBED); \ + MIN_KVER_MAJOR=$(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR); \ + MIN_KVER_MINOR=$(LINUX_BACKPORTS_MINIMAL_KVER_MINOR); \ KVER_MAJOR=`echo $${KVER} | sed 's/^\([0-9]*\)\..*/\1/'`; \ KVER_MINOR=`echo $${KVER} | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`; \ - if [ $${KVER_MAJOR} -lt 3 -o \( $${KVER_MAJOR} -eq 3 -a $${KVER_MINOR} -lt 10 \) ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.10 or later)\n" \ - "$${KVER}"; \ + if [ $${KVER_MAJOR} -lt $(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR) \ + -o \( $${KVER_MAJOR} -eq $(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR) \ + -a $${KVER_MINOR} -lt $(LINUX_BACKPORTS_MINIMAL_KVER_MINOR) \ + \) ]; then \ + printf "Linux version '%s' is too old for linux-backports (needs %s.%s or later)\n" \ + "$${KVER}" \ + "$(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR)" \ + "$(LINUX_BACKPORTS_MINIMAL_KVER_MINOR)"; \ exit 1; \ fi $(Q)touch $(@) From fd760d86b6b988363f7617689d148cccc5f2fed6 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 18 Aug 2022 23:51:43 +0200 Subject: [PATCH 041/140] package/libnss: bump version to 3.82 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- 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 8330d255a7..2133113a4f 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_81_RTM/src/SHA256SUMS -sha256 a8bf5f3bb617068d57e7b15f3d9d528f109af0d57df2eaab0519b6423edccca6 nss-3.81.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_82_RTM/src/SHA256SUMS +sha256 32bf673b72c2f9953ed3b4c7033abf5a6cad302854a24ae588c575a6567c1573 nss-3.82.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 4283ef520f..d1ad408a01 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.81 +LIBNSS_VERSION = 3.82 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 cfa17c44d0b63815fc3149e50a514915c638ebf3 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Wed, 17 Aug 2022 22:58:23 +0200 Subject: [PATCH 042/140] package/stunnel: bump to version 5.65 Update COPYING hash; copyright year update: -_Copyright (C) 1998-2021 Michal Trojnara_ +_Copyright (C) 1998-2022 Michal Trojnara_ See full changelog https://www.stunnel.org/NEWS.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Yann E. MORIN --- package/stunnel/stunnel.hash | 6 +++--- package/stunnel/stunnel.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index b8cc62be13..19633b3c18 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.60.tar.gz.sha256 -sha256 c45d765b1521861fea9b03b425b9dd7d48b3055128c0aec673bba5ef9b8f787d stunnel-5.60.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.65.tar.gz.sha256 +sha256 60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc stunnel-5.65.tar.gz # Locally calculated -sha256 28b55d0157efd5ceb63640faeebb50fda13b1f49aec0b9c1240b9a3ea9f0eb4c COPYING.md +sha256 f10bcd7ee7b722dce40c9c674761ddb37e7e29a76a6e413e961cd52e361c5d7a COPYING.md sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index cc56eb39a8..95a1530eb8 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).60 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).65 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ From db1550518062b93ced504ab0d8d43347a0b1adeb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 17 Aug 2022 17:33:12 +0200 Subject: [PATCH 043/140] package/tor: bump version to 0.4.7.10 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.7/ReleaseNotes Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 dd1edfa97c..dba08f51b5 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.8.tar.gz.sha256sum -sha256 9e9a5c67ad2acdd5f0f8be14ed591fed076b1708abf8344066990a0fa66fe195 tor-0.4.7.8.tar.gz +# From https://dist.torproject.org/tor-0.4.7.10.tar.gz.sha256sum +sha256 647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b tor-0.4.7.10.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 0e4bb553e2..ed3714f2db 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.8 +TOR_VERSION = 0.4.7.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 13faa449e16d955182d5bac132142b7ba07c65e3 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Tue, 16 Aug 2022 12:37:10 +0200 Subject: [PATCH 044/140] package/pkg-meson.mk: handle possibly non existing compilers To avoid populating the cross-file with non existing compilers, we tie them to /bin/false. As explained by @eliebrokeit on the meson IRC channel: If you don't have one [a compiler] defined, cross builds won't try to autodetect one, IIRC... ... however setting it to /bin/false will result in it detecting that that doesn't work I guess the safest bet is to deliberately poison it with /bin/false So there we go. Signed-off-by: Guillaume W. Bres [yann.morin.1998@free.fr: expand with IRC snippet] Signed-off-by: Yann E. MORIN --- package/pkg-meson.mk | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 0632ab21cf..d675f7f733 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -68,15 +68,29 @@ else PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) endif +# To avoid populating the cross-file with non existing compilers, +# we tie them to /bin/false +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +PKG_MESON_TARGET_CXX = $(TARGET_CXX) +else +PKG_MESON_TARGET_CXX = /bin/false +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +PKG_MESON_TARGET_FC = $(TARGET_FC) +else +PKG_MESON_TARGET_FC = /bin/false +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). # Arguments are variable containing cflags, cxxflags, ldflags, fcflags define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CC@%$(TARGET_CC)%g" \ - -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \ + -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ - -e "s%@TARGET_FC@%$(TARGET_FC)%g" \ + -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ From 3b4d8daa6d30cb09ba9d57b15299a722d2f57a38 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 21 Aug 2022 11:29:24 +0200 Subject: [PATCH 045/140] package/zic: bump to 2022c Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- .../zic/0001-remove-dependency-check-on-version-file.patch | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index 62adc59c83..64587bc0df 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -593,7 +593,7 @@ INSTALL: ALL install date.1 +@@ -609,7 +609,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 9e17621de8..c9c7491948 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html -sha512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a tzcode2021e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2022-August/000072.html +sha512 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06 tzcode2022c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 13f3a83bce..bb5cd3c916 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2021e +ZIC_VERSION = 2022c ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From 638b1422c6bb99f99ee043b79edfd01cdfdf6c2b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 21 Aug 2022 11:29:23 +0200 Subject: [PATCH 046/140] package/tzdata: bump to version 2022c update homepage with https Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/tzdata/Config.in | 2 +- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tzdata/Config.in b/package/tzdata/Config.in index 1e6cc0fc64..31071afb03 100644 --- a/package/tzdata/Config.in +++ b/package/tzdata/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_TZDATA help Time zone database - http://www.iana.org/time-zones/repository/tz-link.html + https://data.iana.org/time-zones/tz-link.html diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 55346539ab..b203e5bf5b 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html -sha512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 tzdata2021e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2022-August/000072.html +sha512 e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b tzdata2022c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 9cf8c2ea45..21ea94ecad 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2021e +TZDATA_VERSION = 2022c TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 From 0b7e7bc70b3b7f3125aa0ef780f4fbf61cd6cd4b Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Thu, 27 Jan 2022 11:46:58 +0100 Subject: [PATCH 047/140] package/network-manager: add optional nmcli support The network-manager package builds the nmcli utility when the readline package is enabled. However, this is not necessarily obvious to the user. Therefore, this commit adds an explicit option to enable the nmcli tool, which automatically selects readline. Signed-off-by: Michael Fischer [yann.morin.1998@free.fr: rewrap commit log and help text] Signed-off-by: Yann E. MORIN --- package/network-manager/Config.in | 8 +++++++- package/network-manager/network-manager.mk | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 39114daf18..1a11fc4270 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -33,6 +33,13 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI help This option enables terminal based UI +config BR2_PACKAGE_NETWORK_MANAGER_CLI + bool "nmcli support" + select BR2_PACKAGE_READLINE + help + This option enables support for the NetworkManager Command + Line Interface + config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER @@ -50,7 +57,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS select BR2_PACKAGE_JANSSON help 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" diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 3c39ce7d6d..92997d1cb6 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -142,7 +142,7 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-polkit endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli else From e3b2bc21d52fc949ac62964bc4c628c5143e4954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Lebrun?= Date: Thu, 17 Mar 2022 18:03:17 +0100 Subject: [PATCH 048/140] package/signal-estimator: add new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to use the git download mechanism, as the package depends on a submodule (an old version of cxxopt), and this is not included in the archive autogenerated by Github. Signed-off-by: Théo Lebrun [yann.morin.1998@free.fr: - bump to 0.0.4 - reword commit log ad help text - other eye-candy reformatting ] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/signal-estimator/Config.in | 17 +++++++++++++++++ .../signal-estimator/signal-estimator.hash | 3 +++ package/signal-estimator/signal-estimator.mk | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 package/signal-estimator/Config.in create mode 100644 package/signal-estimator/signal-estimator.hash create mode 100644 package/signal-estimator/signal-estimator.mk diff --git a/package/Config.in b/package/Config.in index d1c098c48f..2c2752b412 100644 --- a/package/Config.in +++ b/package/Config.in @@ -142,6 +142,7 @@ menu "Debugging, profiling and benchmark" source "package/rt-tests/Config.in" source "package/rwmem/Config.in" source "package/sentry-native/Config.in" + source "package/signal-estimator/Config.in" source "package/spidev_test/Config.in" source "package/strace/Config.in" source "package/stress/Config.in" diff --git a/package/signal-estimator/Config.in b/package/signal-estimator/Config.in new file mode 100644 index 0000000000..30c6e966ab --- /dev/null +++ b/package/signal-estimator/Config.in @@ -0,0 +1,17 @@ +comment "signal-estimator needs a toochain w/ C++, threads, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_SIGNAL_ESTIMATOR + bool "signal-estimator" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + select BR2_PACKAGE_ALSA_LIB + help + signal-estimator is a small command-line and GUI tool allowing + to measure different characteristics of the signal looped back + from audio output to audio input. + + https://github.com/gavv/signal-estimator diff --git a/package/signal-estimator/signal-estimator.hash b/package/signal-estimator/signal-estimator.hash new file mode 100644 index 0000000000..c10aa16d50 --- /dev/null +++ b/package/signal-estimator/signal-estimator.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6256b881bd9285fdcf133628cf6dd6b0e2758c08bada231e44b2684a3cf7898f signal-estimator-v0.0.4-br1.tar.gz +sha256 e836fc784cb6ed2d160f1c1ecdf1303ed57436a86f66f97e5406a1b79e6db55e LICENSE diff --git a/package/signal-estimator/signal-estimator.mk b/package/signal-estimator/signal-estimator.mk new file mode 100644 index 0000000000..cb1594b58d --- /dev/null +++ b/package/signal-estimator/signal-estimator.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# signal-estimator +# +################################################################################ + +SIGNAL_ESTIMATOR_VERSION = v0.0.4 +SIGNAL_ESTIMATOR_SITE = https://github.com/gavv/signal-estimator +SIGNAL_ESTIMATOR_SITE_METHOD = git +SIGNAL_ESTIMATOR_GIT_SUBMODULES = YES + +SIGNAL_ESTIMATOR_LICENSE = MIT +SIGNAL_ESTIMATOR_LICENSE_FILES = LICENSE + +SIGNAL_ESTIMATOR_DEPENDENCIES = alsa-lib + +SIGNAL_ESTIMATOR_CONF_OPTS += -DBUILD_GUI=OFF + +$(eval $(cmake-package)) From b35ba00e715816231924d6dd20c164ab0229a32c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 5 Aug 2022 00:15:57 +0200 Subject: [PATCH 049/140] package/sdl2: be more explicit in disabling optional features Add many more explicit --disable-, as we have for example seen video-vivante being autodetected when not needed. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/sdl2/sdl2.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 94533fa9b4..d255112ce9 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -20,7 +20,24 @@ SDL2_CONF_OPTS += \ --disable-esd \ --disable-dbus \ --disable-pulseaudio \ - --disable-video-wayland + --disable-video-vivante \ + --disable-video-cocoa \ + --disable-video-metal \ + --disable-video-wayland \ + --disable-video-dummy \ + --disable-video-offscreen \ + --disable-video-vulkan \ + --disable-ime \ + --disable-ibus \ + --disable-fcitx \ + --disable-joystick-mfi \ + --disable-directx \ + --disable-xinput \ + --disable-wasapi \ + --disable-hidapi-joystick \ + --disable-hidapi-libusb \ + --disable-joystick-virtual \ + --disable-render-d3d # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. From d6df46fb145c4211b0750b0362b6e3ca832e8231 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 5 Aug 2022 00:15:58 +0200 Subject: [PATCH 050/140] package/sdl2: be explicit about OpenGL ES options In addition to --enable-video-opengles, SDL2 configure script also looks at --enable-video-opengles1 and --enable-video-opengles2. Since all OpenGL ES providers in Buildroot provide at least up to OpenGL ES 2, enable both options when BR2_PACKAGE_SDL2_OPENGLES=y. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: split long lines] Signed-off-by: Yann E. MORIN --- package/sdl2/sdl2.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index d255112ce9..dec25edf1b 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -155,10 +155,16 @@ SDL2_CONF_OPTS += --disable-video-opengl endif ifeq ($(BR2_PACKAGE_SDL2_OPENGLES),y) -SDL2_CONF_OPTS += --enable-video-opengles +SDL2_CONF_OPTS += \ + --enable-video-opengles \ + --enable-video-opengles1 \ + --enable-video-opengles2 SDL2_DEPENDENCIES += libgles else -SDL2_CONF_OPTS += --disable-video-opengles +SDL2_CONF_OPTS += \ + --disable-video-opengles \ + --disable-video-opengles1 \ + --disable-video-opengles2 endif ifeq ($(BR2_PACKAGE_ALSA_LIB),y) From 8ab036d26f5811d604433013b9fbefbf0227a5c1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 5 Aug 2022 00:15:59 +0200 Subject: [PATCH 051/140] package/sdl2: rework KMS/DRM video driver dependencies The KMS/DRM video driver of SDL2 can currently only be enabled when mesa3d is the OpenGL provider, as the option has a dependency on BR2_PACKAGE_MESA3D_GBM. Now that we have a libgbm virtual package and BR2_PACKAGE_HAS_LIBGBM, we can do better. However, this has uncovered a number of additional related issues that are resolved at the same time. Here are some details: * the 'depends on BR2_PACKAGE_LIBDRM' is changed to a select, as we normally do for library dependencies. Due to this, we inherit a BR2_TOOLCHAIN_HAS_THREADS dependency. * the 'depends on BR2_PACKAGE_MESA3D_GBM' is changed to 'depends on BR2_PACKAGE_HAS_LIBGBM', and the 'mesa3d' dependency is changed to 'libgbm'. * the KMS/DRM video driver in SDL2 needs EGL (hence the additional 'depends on BR2_PACKAGE_HAS_LIBEGL' and the libegbl dependency is added in the .mk file). But in turn, EGL support is only checked when either OpenGL or OpenGLES support is enabled in SDL2, which is why we add logic to select the appropriate options. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - fix dependency on comment (invert the symbol dependencies) - split comment ] Signed-off-by: Yann E. MORIN --- package/sdl2/Config.in | 17 +++++++++++------ package/sdl2/sdl2.mk | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 2ad45e4d00..7c8258fe73 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -31,14 +31,19 @@ comment "X11 video driver needs X.org" config BR2_PACKAGE_SDL2_KMSDRM bool "KMS/DRM video driver" - depends on BR2_PACKAGE_LIBDRM - depends on BR2_PACKAGE_MESA3D_GBM + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_SDL2_OPENGL || BR2_PACKAGE_SDL2_OPENGLES + select BR2_PACKAGE_LIBDRM -comment "KMS/DRM video driver needs libdrm" - depends on !BR2_PACKAGE_LIBDRM +comment "KMS/DRM video driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS -comment "KMS/DRM video driver needs mesa3d w/ GBM" - depends on !BR2_PACKAGE_MESA3D_GBM +comment "KMS/DRM video driver needs a GBM provider, and OpenGL or OpenGLES+EGL" + depends on !BR2_PACKAGE_HAS_LIBGBM || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !(BR2_PACKAGE_SDL2_OPENGL || BR2_PACKAGE_SDL2_OPENGLES) config BR2_PACKAGE_SDL2_OPENGL bool "OpenGL (GLX)" diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index dec25edf1b..58c2a04c1c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -175,7 +175,7 @@ SDL2_CONF_OPTS += --disable-alsa endif ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y) -SDL2_DEPENDENCIES += libdrm mesa3d +SDL2_DEPENDENCIES += libdrm libgbm libegl SDL2_CONF_OPTS += --enable-video-kmsdrm else SDL2_CONF_OPTS += --disable-video-kmsdrm From 7e185002018c9c43664632b13b030c4693eb110b Mon Sep 17 00:00:00 2001 From: Federico Pellegrin Date: Mon, 22 Aug 2022 06:51:49 +0200 Subject: [PATCH 052/140] package/kexec: bump to version 2.0.25 https://www.spinics.net/lists/kexec/msg29887.html Signed-off-by: Federico Pellegrin Signed-off-by: Thomas Petazzoni --- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index dcf661cce4..34e17339b9 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 af230ce6430deb6c2ab35762f8028888ac9d6ebefc2c4c83224a9c109143c0e8 kexec-tools-2.0.24.tar.xz +sha256 7ce2e5def38ec04f79feb107d02243dd586fbc68569eccf02f44bad3a13ec07d kexec-tools-2.0.25.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index c08a9155f2..ced7009ed3 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.24 +KEXEC_VERSION = 2.0.25 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From 66416e5a8822f90d85dcb0188332a9480f728663 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 22 Aug 2022 08:18:46 +0200 Subject: [PATCH 053/140] package/s390-tools: bump to version 2.23.0 Fixes: - https://release-monitoring.org/project/10714/ Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index dc9209856b..f74695b81d 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d0f56fe4f6a62dda45ccd87191e42ebfaec82671ff4b96cc2229a7fe240ce072 s390-tools-2.21.0.tar.gz +sha256 c04d1f7d7f4c941f19a293188eb6302194cc298171f88a4dc17a08a8001c6c01 s390-tools-2.23.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index f381100792..99fc669ce7 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.21.0 +S390_TOOLS_VERSION = 2.23.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE @@ -93,6 +93,20 @@ else S390_TOOLS_MAKE_OPTS += HAVE_SNMP=0 endif +ifeq ($(BR2_PACKAGE_LIBLOCKFILE),y) +S390_TOOLS_DEPENDENCIES += liblockfile +S390_TOOLS_MAKE_OPTS += HAVE_LOCKFILE=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_LOCKFILE=0 +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +S390_TOOLS_DEPENDENCIES += udev +S390_TOOLS_MAKE_OPTS += HAVE_LIBUDEV=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_LIBUDEV=0 +endif + define S390_TOOLS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ $(S390_TOOLS_MAKE_OPTS) From 0343dd2906c67d7d7f7b4216ddcdee890ef43403 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 01:07:56 -0600 Subject: [PATCH 054/140] package/python-frozenlist: bump to version 1.3.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index 034150397b..4d1ac3b411 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 e65d870bd189ba3c21ab7eb10eab22b7 frozenlist-1.3.0.tar.gz -sha256 ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b frozenlist-1.3.0.tar.gz +md5 6ac017ba79ac7a1491e47e89012efeab frozenlist-1.3.1.tar.gz +sha256 3a735e4211a04ccfa3f4833547acdf5d2f863bfeb01cfd3edaffbc251f15cec8 frozenlist-1.3.1.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index ad618971f7..51b5d42832 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.3.0 +PYTHON_FROZENLIST_VERSION = 1.3.1 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/f4/f7/8dfeb76d2a52bcea2b0718427af954ffec98be1d34cd8f282034b3e36829 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/8a/95/229aacfe85daa28e2792481a98c336bc30d3729533e6a44db537880aca21 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE From 590bc8efb6c54539471826974b4e457dd1e99034 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 01:11:02 -0600 Subject: [PATCH 055/140] package/python-charset-normalizer: bump to version 2.1.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- .../python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index 8aefddbbf1..3d50b2872d 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 c1be418ec00773d84d793f23b2bbc3cd charset-normalizer-2.1.0.tar.gz -sha256 575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 charset-normalizer-2.1.0.tar.gz +md5 a70f9fc85b6b8265c982eca6fe51381f charset-normalizer-2.1.1.tar.gz +sha256 5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 charset-normalizer-2.1.1.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index c313d4cbce..72728a25b3 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 2.1.0 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.1.1 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/93/1d/d9392056df6670ae2a29fcb04cfa5cee9f6fbde7311a1bb511d4115e9b7a +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/a1/34/44964211e5410b051e4b8d2869c470ae8a68ae274953b1c7de6d98bbcf94 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From 9bbcc554dd12acdbdd1484f17e72423658982025 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 01:15:57 -0600 Subject: [PATCH 056/140] package/python-fonttools: bump to version 4.36.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 469fea9c19..4f6536dbfb 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 197ad603c91d4c2909acf9e54c26e85f fonttools-4.34.4.zip -sha256 9a1c52488045cd6c6491fd07711a380f932466e317cb8e016fc4e99dc7eac2f0 fonttools-4.34.4.zip +md5 5eb0df388216de4bfd058153d16c75bf fonttools-4.36.0.zip +sha256 e637d2fe06bddabbfc488e02ef32d04d561e3c71e9ba11abc7782ea753ceb218 fonttools-4.36.0.zip # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index c35c538cb6..6281359e86 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.34.4 +PYTHON_FONTTOOLS_VERSION = 4.36.0 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/5a/a4/a97cff4c4af6764a04cc202299e5205b2e101cb1543bcaf9737be29f78ab +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/df/4b/ca51dbaf267decfcc7ca9300cdc703206c1c05f3e2beb5140a71817c2d7e PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From d893182a4c74e4ebbfd8d0facf025b68d61a3512 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 01:22:41 -0600 Subject: [PATCH 057/140] package/python-pep517: bump to version 0.13.0 Changes: https://github.com/pypa/pep517/blob/main/doc/changelog.rst#013 Remove support for end-of-life Pythons. Now requires Python3.6+. Remove support for toml package. Now requires tomli. Rely on preferred "files" API on Python 3.9 and later. Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-pep517/python-pep517.hash | 4 ++-- package/python-pep517/python-pep517.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash index 4dd4c47fa0..6535e51656 100644 --- a/package/python-pep517/python-pep517.hash +++ b/package/python-pep517/python-pep517.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pep517/json -md5 7ed0adb5f737c316e071d48d66329a5d pep517-0.12.0.tar.gz -sha256 931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 pep517-0.12.0.tar.gz +md5 7fd08b11215256601a8a4940c1ba3d34 pep517-0.13.0.tar.gz +sha256 ae69927c5c172be1add9203726d4b84cf3ebad1edcd5f71fcdc746e66e829f59 pep517-0.13.0.tar.gz # Locally computed sha256 checksums sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 45c4f8dd39..1fd294fbb4 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEP517_VERSION = 0.12.0 +PYTHON_PEP517_VERSION = 0.13.0 PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz -PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 +PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/4d/19/e11fcc88288f68ae48e3aa9cf5a6fd092a88e629cb723465666c44d487a0 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE PYTHON_PEP517_SETUP_TYPE = flit-bootstrap From ed92ca13d9de57a21e242098fea8a7d37955e232 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 22 Aug 2022 10:08:29 +0200 Subject: [PATCH 058/140] package/sdl2: bump version to 2.24.0 New version numbering scheme, similar to GLib and Flatpak version 2.0.24 is now 2.24.0 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 a5dad638bb..981c98531e 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.0.22.tar.gz.sig -sha256 fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e SDL2-2.0.22.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.0.tar.gz.sig +sha256 91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97 SDL2-2.24.0.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 58c2a04c1c..4585c33c9b 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.22 +SDL2_VERSION = 2.24.0 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From ff0bbbb76fe5addbc970449c9627ab864a3c6d43 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 02:40:47 -0600 Subject: [PATCH 059/140] package/python-pycares: bump to version 4.2.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pycares/python-pycares.hash | 4 ++-- package/python-pycares/python-pycares.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 2037c17172..13f640b1c1 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 92fa9622ba42cb895d598910722e80b5 pycares-4.2.1.tar.gz -sha256 735b4f75fd0f595c4e9184da18cd87737f46bc81a64ea41f4edce2b6b68d46d2 pycares-4.2.1.tar.gz +md5 7706a01fdbfc593564b63ac0d71031d9 pycares-4.2.2.tar.gz +sha256 e1f57a8004370080694bd6fb969a1ffc9171a59c6824d54f791c1b2e4d298385 pycares-4.2.2.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index e2b813b278..858adbf33b 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.2.1 +PYTHON_PYCARES_VERSION = 4.2.2 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/99/da/d3d20bc7bd5baadeea04ee84db16f1f07557138c313bd6200e1cffab5bee +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/ac/a3/21594384c2398420dd7f6e8656aeb5a2c15128ddf2b85ef5f4403342e18d PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE From dba15762cf9f5fd93b8bf2c37e5b68cfb71872b3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 02:43:31 -0600 Subject: [PATCH 060/140] package/python-typing-inspect: bump to version 0.8.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-typing-inspect/python-typing-inspect.hash | 4 ++-- package/python-typing-inspect/python-typing-inspect.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-typing-inspect/python-typing-inspect.hash b/package/python-typing-inspect/python-typing-inspect.hash index f3ff6b642b..737373d609 100644 --- a/package/python-typing-inspect/python-typing-inspect.hash +++ b/package/python-typing-inspect/python-typing-inspect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing-inspect/json -md5 1444feceb8213bd94cfece3c6d4ffc5c typing_inspect-0.7.1.tar.gz -sha256 047d4097d9b17f46531bf6f014356111a1b6fb821a24fe7ac909853ca2a782aa typing_inspect-0.7.1.tar.gz +md5 d56c8277a55d0bf061275df1ea3785d5 typing_inspect-0.8.0.tar.gz +sha256 8b1ff0c400943b6145df8119c41c244ca8207f1f10c9c057aeed1560e4806e3d typing_inspect-0.8.0.tar.gz # Locally computed sha256 checksums sha256 f9d3567d00ca2337f769fb28c553cc590213ecefed4ed599110c10ded2ea0117 LICENSE diff --git a/package/python-typing-inspect/python-typing-inspect.mk b/package/python-typing-inspect/python-typing-inspect.mk index eef1f0b586..8573bb1c27 100644 --- a/package/python-typing-inspect/python-typing-inspect.mk +++ b/package/python-typing-inspect/python-typing-inspect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_INSPECT_VERSION = 0.7.1 +PYTHON_TYPING_INSPECT_VERSION = 0.8.0 PYTHON_TYPING_INSPECT_SOURCE = typing_inspect-$(PYTHON_TYPING_INSPECT_VERSION).tar.gz -PYTHON_TYPING_INSPECT_SITE = https://files.pythonhosted.org/packages/c3/da/864ce66818e308b38209d4b1ef0585921d28eb07621ba7d905a0e96bcc80 +PYTHON_TYPING_INSPECT_SITE = https://files.pythonhosted.org/packages/72/23/bed3ea644bcd77ffe9a7f591eb058c00739747e33ab94d80cc4319ddee8e PYTHON_TYPING_INSPECT_SETUP_TYPE = setuptools PYTHON_TYPING_INSPECT_LICENSE = MIT PYTHON_TYPING_INSPECT_LICENSE_FILES = LICENSE From 8c1702594eb25b26b15cec22a117174edee0624d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 02:48:58 -0600 Subject: [PATCH 061/140] package/python-weasyprint: bump to version 56.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 70c4e19832..68b895361b 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 8891a483640daf4f9f234f96437fc056 weasyprint-55.0.tar.gz -sha256 ea5d5f2f159262e38b6e85939d8510e9735a47751a9647c9eaa93c22ced86230 weasyprint-55.0.tar.gz +md5 0a339942d1d238aa0b974c1ec1580c03 weasyprint-56.1.tar.gz +sha256 27f796abce8edebc9e5b3cff2d095a9fa2b0af5766801431659db51203c70b38 weasyprint-56.1.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index d6e6895f00..aff9a31a43 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 55.0 +PYTHON_WEASYPRINT_VERSION = 56.1 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/8c/a5/1a0f1f60a0dabd475d3c36739eeb43bec2da2d9d57f4a6cd95964f8b34b7 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/30/2c/9c29989bf03bb573bd963c2cf167839099bdaff05aff1f0eff2ccbd1b509 PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From 2f954aacb9ee401ed4bdbf924cbf55b5816b5477 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 02:53:42 -0600 Subject: [PATCH 062/140] package/python-yarl: bump to version 1.8.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-yarl/python-yarl.hash | 4 ++-- package/python-yarl/python-yarl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index bf971e9a9a..b4e411cbdf 100644 --- a/package/python-yarl/python-yarl.hash +++ b/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 acd3eb25a9c46b10a699a3bee5fb9777 yarl-1.7.2.tar.gz -sha256 45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd yarl-1.7.2.tar.gz +md5 ff8f2843481cd11c3c674ce4f6fa167b yarl-1.8.1.tar.gz +sha256 af887845b8c2e060eb5605ff72b6f2dd2aab7a761379373fd89d314f4752abbf yarl-1.8.1.tar.gz # Locally computed sha256 checksums sha256 56d6ac6c8105c0a51304c21db060e361af9a8ea0af9a75c239c28b5d13693838 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index 175aaa7a35..55bfbab53e 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.7.2 +PYTHON_YARL_VERSION = 1.8.1 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/f6/da/46d1b3d69a9a0835dabf9d59c7eb0f1600599edd421a4c5a15ab09f527e0 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/d6/04/255c68974ec47fa754564c4abba8f61f9ed68b869bbbb854198d6259c4f7 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools From 5bb747f0b783a0d3f1712350ca3277263045b299 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 03:00:23 -0600 Subject: [PATCH 063/140] package/gensio: bump to version 2.5.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gensio/gensio.hash | 6 +++--- package/gensio/gensio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash index 930a2fff81..a0db4bc516 100644 --- a/package/gensio/gensio.hash +++ b/package/gensio/gensio.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 45cd3a4d9058816e50351b0700a035ad gensio-2.2.9.tar.gz -sha1 4bb34517931f5be4dc5982f6e7a567cf6fdc41b8 gensio-2.2.9.tar.gz +md5 60f90f62180922e2c7550877c4bb950c gensio-2.5.2.tar.gz +sha1 b6c2ec39b51a56f5d28e88a59122f4c65ff844fa gensio-2.5.2.tar.gz # Locally computed: -sha256 3609f66e61c98cce181ec1b37508b727b636d7cfffdb6edd4c254d2f6097a000 gensio-2.2.9.tar.gz +sha256 f7bc3d2ba9da73489dd3227a21ddd2f44a18c443185ce2b1a08ec564da06e6d1 gensio-2.5.2.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index b27158c61f..f1cc00bf32 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENSIO_VERSION = 2.2.9 +GENSIO_VERSION = 2.5.2 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING From 85a3bfc4ca93252517337ed82ae7370372ec5e34 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 22 Aug 2022 03:11:35 -0600 Subject: [PATCH 064/140] package/ser2net: bump to version 4.3.7 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ser2net/ser2net.hash | 6 +++--- package/ser2net/ser2net.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 31a7518428..db493b28cb 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 e6d88a440852e28b8e2978003b00e154 ser2net-4.3.4.tar.gz -sha1 74d02c19c2eef219b59a47fbc61b4fb09cf608d3 ser2net-4.3.4.tar.gz +md5 3323783668b20016d79458e82327cff8 ser2net-4.3.7.tar.gz +sha1 88c0542b3b5e8ce03bc99ace00b2e163382e726e ser2net-4.3.7.tar.gz # Locally computed: -sha256 c714d6777849100b2ca3f216d1cfc36d4573639ececc91d5c7809dfe27c8428e ser2net-4.3.4.tar.gz +sha256 542915e240ae8b5c7dcec8d1589e6067818532900d45cfef226cea9f0e671d13 ser2net-4.3.7.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index bec2a9c202..393d358033 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 4.3.4 +SER2NET_VERSION = 4.3.7 SER2NET_SITE = https://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING From 2e3ef50648f3356a0e8e06182be1e482a3ec2a53 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 22 Aug 2022 13:50:36 +0200 Subject: [PATCH 065/140] package/uuu: bump to version 1.4.240 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 7291f93c52..9396926781 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 b8b7fcd0e8eca64a255bf2b964bfb39a97599670e5258858421b27ff86aac80f uuu_source-1.4.224.tar.gz +sha256 2a1971438f70f77fae0578fb59b831d1e6de38f8c63f0f26e516248d9451a057 uuu_source-1.4.240.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 52b1828ddb508a180cf9ad159b61e655c72dfb25ffce67eb0aef761d38a4398f README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647254446f..0cd4427697 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.4.224 +UUU_VERSION = 1.4.240 UUU_SOURCE = uuu_source-$(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 e8ecf4238707b93df190e0eb0de1c0ca9b6fbd29 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 22 Aug 2022 20:26:20 +0200 Subject: [PATCH 066/140] package/ethtool: bump to version 5.19 Signed-off-by: Francois Perrad 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 052a87d978..8a649876d9 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 9577b2ffbce710b659fb239598ec92bced1ca400ca0f1286762bfa44e4784270 ethtool-5.18.tar.xz +sha256 3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 ethtool-5.19.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 9fd4c31c7b..32bd5e7db1 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.18 +ETHTOOL_VERSION = 5.19 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From eb710c3a346de48ae6da5b1afcc820ad89297319 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 22 Aug 2022 20:26:39 +0200 Subject: [PATCH 067/140] package/lighttpd: bump to version 1.4.66 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 0b4310aa72..b45fecc609 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.65.sha512sum -sha512 e9ecb3e99dd5cd0efbf98cfc937f0cfcfafe712ab0e6c11f9cdee936c508820cd8de06ef03d2f888dab19a842eebae342a83818e601dd21094f154832acb69ec lighttpd-1.4.65.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.66.sha512sum +sha512 6d4ae1faa0ebc3115b7ad4fc84ccdd476ca71ee701d115c1a320f525c6c3ce884b48af38f65e4f1c012b4d0936755925b16f8d37aad810a286b2349c27f47567 lighttpd-1.4.66.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bedb9c8f33..0905b0ae14 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).65 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).66 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause From b23e33f89cfbd8be6849f115df4cd12bd3bdbf8e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 22 Aug 2022 20:26:53 +0200 Subject: [PATCH 068/140] package/open62541: bump to version 1.3.3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- 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 f5402ffdbb..22c13851bf 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e2a47ee6c6e5e7b9a9c803ff717670707d040710bb65d2615c0df33a614e629 open62541-v1.3.2-br1.tar.gz +sha256 283545991c3eb36b18c75a64638c7c2ad8f193654c2403b76aee848abf454e14 open62541-v1.3.3-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 0551c3bca6..edc95dcf15 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.2 +OPEN62541_VERSION = v1.3.3 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From a1b26020d133499d90a547d73d6388286c95b658 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 22 Aug 2022 20:27:08 +0200 Subject: [PATCH 069/140] package/spi-tools: bump to version 1.0.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/spi-tools/spi-tools.hash | 2 +- package/spi-tools/spi-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index 1595cd3d2c..7a840b9155 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz +sha256 f6a93ae4f729d42e9200ba491cf9088202b63cb88e011cf6bcb0a7d12432cdc4 spi-tools-1.0.2.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index d623babf48..c3732fcb86 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 1.0.1 +SPI_TOOLS_VERSION = 1.0.2 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES From 7b31593d8299babf94c7851218dec9c7041cfa35 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 22 Aug 2022 20:29:14 +0200 Subject: [PATCH 070/140] package/strace: bump to version 5.19 Signed-off-by: Francois Perrad 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 c044563b33..cadcb20f47 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/5.18/strace-5.18.tar.xz.asc -sha256 60293ea79ac9253d600cdc9be077ad2988ca22284a439c9e66be5150db3d1187 strace-5.18.tar.xz +# https://strace.io/files/5.19/strace-5.19.tar.xz.asc +sha256 aa3dc1c8e60e4f6ff3d396514aa247f3c7bf719d8a8dc4dd4fa793be786beca3 strace-5.19.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 0e1cb04c44..7bdf36a47e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.18 +STRACE_VERSION = 5.19 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 d4a82916c88aa73fa7486f6febd1672716a50036 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 21 Aug 2022 17:49:01 +0200 Subject: [PATCH 071/140] package/poke: bump to version 1.4 See: http://www.jemarch.net/poke-2.4-relnotes.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poke/poke.hash b/package/poke/poke.hash index c30713b91c..09dc4e8972 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz +sha256 841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 poke-2.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index 2852673548..d49e628dbf 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 2.1 +POKE_VERSION = 2.4 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) From 3ad17d88f4fcd1e76e2835331e5dfc6cc976a2e0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 21 Aug 2022 17:31:03 +0200 Subject: [PATCH 072/140] package/gcc: bump to version 12.2.0 See announce: https://gcc.gnu.org/pipermail/gcc-announce/2022/000174.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../0001-disable-split-stack-for-non-thread-builds.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename package/gcc/{12.1.0 => 12.2.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) diff --git a/package/gcc/12.1.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/12.1.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index ba2a2ee072..87805efcfd 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -83,7 +83,7 @@ config BR2_GCC_VERSION default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "10.4.0" if BR2_GCC_VERSION_10_X default "11.3.0" if BR2_GCC_VERSION_11_X - default "12.1.0" if BR2_GCC_VERSION_12_X + default "12.2.0" if BR2_GCC_VERSION_12_X default "arc-2020.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 b9536ddffe..666124fa6d 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-11.3.0/sha512.sum sha512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 gcc-11.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.1.0/sha512.sum -sha512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900 gcc-12.1.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/sha512.sum +sha512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 gcc-12.2.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz From ab91f93953458389adab8dd482b6fbdc7c1e3a1f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 17 Aug 2022 17:46:32 +0200 Subject: [PATCH 073/140] package/intel-mediadriver: bump version to 22.5.2 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 890f48029e..74870f54de 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 17905258374dafe2051073fee5722527c6b756c111b2962af051b37d1fc0df56 intel-media-22.5.1.tar.gz +sha256 3b53bb6fb7793ef6c498ff086327ceefeef0a72d1f41b1fcaeae552a694fbcd8 intel-media-22.5.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index f43e6d1b42..11a04e8e33 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 = 22.5.1 +INTEL_MEDIADRIVER_VERSION = 22.5.2 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 81f63425eb4f3327180083f1c249b9b327fba536 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 17 Aug 2022 17:46:33 +0200 Subject: [PATCH 074/140] package/intel-mediasdk: bump version to 22.5.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d50a758506..c6e74a86ed 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f8fcb93dccdc946b50b17346aa06fbda08e2c721622233118674a552913a9d2 intel-mediasdk-22.5.1.tar.gz +sha256 d316834a5672e392cb7c1fb95533d5f914cb62d66573a70ed9d18d959d4b5694 intel-mediasdk-22.5.2.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 3ccbcdf107..06980f38f3 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.5.1 +INTEL_MEDIASDK_VERSION = 22.5.2 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From 85f7d623d6867c3fecf182412002acedbbb1b3d9 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Tue, 23 Aug 2022 01:14:52 +0300 Subject: [PATCH 075/140] package/sdbus-cpp: bump to version 1.2.0 Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v1.2.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 3a0e863a86..169fad2807 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz +sha256 7f7231904abb6a996b8c18ddc5fb50078ef5dff5191649abf9f127aff41d24e9 v1.2.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index e0fbc5c856..0e8d74cfcd 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.1.0 +SDBUS_CPP_VERSION = 1.2.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES From 58c58466319a7864441dc6c70e880165db79ead0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 27 Mar 2022 11:31:37 -0600 Subject: [PATCH 076/140] package/network-manager: migrate autotools build system to meson We need to add dbus as a build dependency since the meson build system uses dbus pkg-config to determine install locations. The meson build also requires mobile-broadband-info in order to get the database pkg-config variable. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 106 ++++++++++----------- 2 files changed, 51 insertions(+), 56 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 1a11fc4270..1f56daa187 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -43,6 +43,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_CLI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 92997d1cb6..d782370082 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 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 -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ host-intltool libndp util-linux NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,136 +17,130 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) -NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=iwd endif else NETWORK_MANAGER_CONF_OPTS += \ - --without-iwd \ - --with-config-wifi-backend-default=wpa_supplicant + -Diwd=false \ + -Dconfig_wifi_backend_default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -159,4 +153,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From d73bc1eb3a559c96310359cbb2cc7fb1792037df Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 00:09:38 +0300 Subject: [PATCH 077/140] package: Add libmanette libmanette is a library which provides a higher level interface to enumerate and make use of game controllers (gamepads, joysticks). WebKitGTK can use libmanette to expose controllers to web content, which will be enabled on a follow-up patch. Minimal kernel headers 4.16 for input_event_sec and input_event_usec in struct input_event. Signed-off-by: Adrian Perez de Castro [Arnout: add kernel headers dependency suggested by Romain] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/libmanette/Config.in | 17 ++++++++++++ package/libmanette/libmanette.hash | 5 ++++ package/libmanette/libmanette.mk | 42 ++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 package/libmanette/Config.in create mode 100644 package/libmanette/libmanette.hash create mode 100644 package/libmanette/libmanette.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4287fd9cf7..34cce542bd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ F: package/bubblewrap/ F: package/cage/ F: package/cog/ F: package/libepoxy/ +F: package/libmanette/ F: package/libpsl/ F: package/libwpe/ F: package/webkitgtk/ diff --git a/package/Config.in b/package/Config.in index 2c2752b412..802fb5da30 100644 --- a/package/Config.in +++ b/package/Config.in @@ -518,6 +518,7 @@ endmenu source "package/kbd/Config.in" source "package/lcdproc/Config.in" source "package/libiec61850/Config.in" + source "package/libmanette/Config.in" source "package/libubootenv/Config.in" source "package/libuio/Config.in" source "package/linux-backports/Config.in" diff --git a/package/libmanette/Config.in b/package/libmanette/Config.in new file mode 100644 index 0000000000..31fff15286 --- /dev/null +++ b/package/libmanette/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBMANETTE + bool "libmanette" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 -> gettext + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + select BR2_PACKAGE_LIBEVDEV + select BR2_PACKAGE_LIBGLIB2 + help + GObject library which provides access to game controllers. + + https://gitlab.gnome.org/GNOME/libmanette + +comment "libmanette needs a toolchain w/ wchar, threads, headers >= 4.16" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 diff --git a/package/libmanette/libmanette.hash b/package/libmanette/libmanette.hash new file mode 100644 index 0000000000..96089f971a --- /dev/null +++ b/package/libmanette/libmanette.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.6.sha256sum +sha256 63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac libmanette-0.2.6.tar.xz + +# Locally calculated +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libmanette/libmanette.mk b/package/libmanette/libmanette.mk new file mode 100644 index 0000000000..10f2b8a466 --- /dev/null +++ b/package/libmanette/libmanette.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# libmanette +# +################################################################################ + +LIBMANETTE_VERSION_MAJOR = 0.2 +LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).6 +LIBMANETTE_SOURCE = libmanette-$(LIBMANETTE_VERSION).tar.xz +LIBMANETTE_SITE = https://download.gnome.org/sources/libmanette/$(LIBMANETTE_VERSION_MAJOR) +LIBMANETTE_LICENSE = LGPL-2.1+ +LIBMANETTE_LICENSE_FILES = COPYING +LIBMANETTE_INSTALL_STAGING = YES +LIBMANETTE_DEPENDENCIES = \ + libevdev \ + libglib2 \ + $(TARGET_NLS_DEPENDENCIES) + +LIBMANETTE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +LIBMANETTE_CONF_OPTS = \ + -Ddemos=false \ + -Dbuild-tests=false \ + -Dinstall-tests=false \ + -Ddoc=false \ + -Dvapi=false + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBMANETTE_CONF_OPTS += -Dintrospection=true +LIBMANETTE_DEPENDENCIES += gobject-introspection +else +LIBMANETTE_CONF_OPTS += -Dintrospection=false +endif + +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +LIBMANETTE_CONF_OPTS += -Dgudev=enabled +LIBMANETTE_DEPENDENCIES += libgudev +else +LIBMANETTE_CONF_OPTS += -Dgudev=disabled +endif + +$(eval $(meson-package)) From 028611be7195b4e616ea1910126aae36e62d33bf Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 00:09:39 +0300 Subject: [PATCH 078/140] package/webkitgtk: support game controllers via libmanette Add support for the Gamepad API in webkitgtk, depending on libmanette, which is used for implementing access to game controllers. Signed-off-by: Adrian Perez de Castro Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle --- package/webkitgtk/webkitgtk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 8949cb2b1c..0dbb72f970 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -18,7 +18,6 @@ WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ - -DENABLE_GAMEPAD=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GTKDOC=OFF \ -DENABLE_MINIBROWSER=ON \ @@ -71,6 +70,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON +WEBKITGTK_DEPENDENCIES += libmanette +else +WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF +endif + # Only one target platform can be built, assume X11 > Wayland # GTK3-X11 target gives OpenGL from newer libgtk3 versions From 4a340349bccf74ff402ae5487fcd1d7d4af5db1b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 16 Aug 2022 19:55:02 +0200 Subject: [PATCH 079/140] boot/arm-trusted-firmware: allow to generate BL2 from RCW This patch adds the option BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW that allows TF-A to encapsulate a pre-loaded RCW (Reset Configuration Word) file into BL2. Upcoming NXP QorIQ family board needs this option. Signed-off-by: Francois Perrad Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 8 ++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 100ac83482..aa571502b3 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -162,6 +162,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 for the 'qemu_sbsa' platform. In this case, due to the EDK2 build system, the dependency between ATF and EDK is reversed. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW + bool "Include NXP RCW in BL2" + depends on BR2_PACKAGE_HOST_QORIQ_RCW + help + Include the NXP RCW (Reset Control Word) in BL2. See + package/qoriq-rcw/ for more details. This is mostly useful + on NXP LayerScape platforms. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS string "Additional ATF make targets" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 7c4e7edb00..246c0699bb 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -144,6 +144,12 @@ define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL endef endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-qoriq-rcw +ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += pbl +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RCW=$(BINARIES_DIR)/PBL.bin +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31 endif From 75cb88ae667002454aa3a3ec2b927cd171f3bfff Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 16 Aug 2022 19:55:03 +0200 Subject: [PATCH 080/140] configs/ls1028ardb: new defconfig This is the reference design board for the NXP LS1028a SoC. see https://www.nxp.com/design/qoriq-developer-resources/layerscape-ls1028a-reference-design-board:LS1028ARDB Signed-off-by: Francois Perrad Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/freescale/ls1028ardb/genimage.cfg | 23 +++++++ board/freescale/ls1028ardb/readme.txt | 60 +++++++++++++++++++ .../boot/extlinux/extlinux.conf | 4 ++ .../rules.d/73-fsl-enetc-networking.rules | 16 +++++ configs/ls1028ardb_defconfig | 56 +++++++++++++++++ 6 files changed, 161 insertions(+) create mode 100644 board/freescale/ls1028ardb/genimage.cfg create mode 100644 board/freescale/ls1028ardb/readme.txt create mode 100644 board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf create mode 100644 board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules create mode 100644 configs/ls1028ardb_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 34cce542bd..55b23ebef2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1020,9 +1020,11 @@ N: Francisco Gonzalez F: package/ser2net/ N: Francois Perrad +F: board/freescale/ls1028ardb/ F: board/olimex/a20_olinuxino F: board/olimex/imx233_olinuxino/ F: board/olimex/stmp1_olinuxino/ +F: configs/ls1028ardb_defconfig F: configs/olimex_a20_olinuxino_* F: configs/olimex_imx233_olinuxino_defconfig F: configs/olimex_stmp157_olinuxino_lime_defconfig diff --git a/board/freescale/ls1028ardb/genimage.cfg b/board/freescale/ls1028ardb/genimage.cfg new file mode 100644 index 0000000000..3efef0bffc --- /dev/null +++ b/board/freescale/ls1028ardb/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + } + + partition fsbl { + offset = 4K + in-partition-table = "no" + image = "bl2_sd.pbl" + } + + partition ssbl { + offset = 1M + in-partition-table = "no" + image = "fip.bin" + } + + partition rootfs { + offset = 8M + partition-type = 0x83 + bootable = "true" + image = "rootfs.ext4" + } +} diff --git a/board/freescale/ls1028ardb/readme.txt b/board/freescale/ls1028ardb/readme.txt new file mode 100644 index 0000000000..93396a4199 --- /dev/null +++ b/board/freescale/ls1028ardb/readme.txt @@ -0,0 +1,60 @@ +************** +NXP LS1028ARDB +************** + +This file documents the Buildroot support for the LS1028A Reference Design Board. + +for more details about the board and the QorIQ Layerscape SoC, see the following pages: + - https://www.nxp.com/design/qoriq-developer-resources/layerscape-ls1028a-reference-design-board:LS1028ARDB + - https://www.nxp.com/LS1028A + +Build +===== + +First, configure Buildroot for the LS1028ARDB board: + + make ls1028ardb_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl2_sd.pbl + - fip.bin + - fsl-ls1028a-rdb.dtb + - Image + - PBL.bin + - rootfs.ext2 + - rootfs.ext4 -> rootfs.ext2 + - sdcard.img + - u-boot.bin + +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/sdX + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/ls1028ardb/genimage.cfg. + +Boot the LS1028ARDB board +========================= + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the switches SW2[1:4] = 1000 (select SD Card boot option) +- put a DB9F cable into the UART1 Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. diff --git a/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..c08ddde10d --- /dev/null +++ b/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label ls1028ardb-buildroot + kernel /boot/Image + devicetree /boot/fsl-ls1028a-rdb.dtb + append root=/dev/mmcblk0p1 rootwait diff --git a/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules b/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules new file mode 100644 index 0000000000..19f41634bd --- /dev/null +++ b/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules @@ -0,0 +1,16 @@ +# ENETC rules +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", NAME:="eno0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", NAME:="eno1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.2", DRIVERS=="fsl_enetc", NAME:="eno2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.6", DRIVERS=="fsl_enetc", NAME:="eno3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.0", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.1", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.2", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.3", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf1" +# LS1028 switch rules +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", NAME="swp0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", NAME="swp1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p2", NAME="swp2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p3", NAME="swp3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p4", NAME="swp4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p5", NAME="swp5" diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig new file mode 100644 index 0000000000..b6a5a04672 --- /dev/null +++ b/configs/ls1028ardb_defconfig @@ -0,0 +1,56 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72=y + +# Toolchain +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="ls1028a" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_OVERLAY="board/freescale/ls1028ardb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/linux" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" +BR2_TARGET_UBOOT_NEEDS_DTC=y + +# Host utilities +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_QORIQ_RCW=y +BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" From 4c2f0b918c65b1de934800bcc82e571ca4f96b86 Mon Sep 17 00:00:00 2001 From: Bram Vlerick Date: Tue, 16 Aug 2022 09:05:17 +0200 Subject: [PATCH 081/140] package/freescale-imx/firmware-imx: allow ddr firmware version override Add support for selecting a specific version of the DDR firmware version. For example Variscite's imx8mp-var-dart SOM requires the "_202006" version of the lpddr4_pmu_train_* binaries. Signed-off-by: Bram Vlerick Signed-off-by: Thomas Petazzoni --- package/freescale-imx/firmware-imx/Config.in | 10 +++++ .../firmware-imx/firmware-imx.mk | 39 +++++++++++++------ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 06c4d8036c..0c1913e227 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -82,6 +82,16 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR3 endchoice # DDR training FW +config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION + string "DDR3/DDR4/LPDDR4 firmware version" + # Needed for backward compatibility, the package used to + # unconditionally use HW version 201810 when DDR3/DDR4 was + # selected + default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 + help + Use a specific version of the imx ddr binaries. Leaving this + field empty will select the default version. + config BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN hex "(LP)DDR IMEM padding length" default 0x8000 diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 4884079d5c..99fe71a91c 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -36,6 +36,11 @@ define FIRMWARE_IMX_PREPARE_DDR_FW $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(3)).bin endef +FIRMWARE_IMX_DDR_VERSION = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION)) +ifneq ($(FIRMWARE_IMX_DDR_VERSION),) +FIRMWARE_IMX_DDR_VERSION_SUFFIX = _$(FIRMWARE_IMX_DDR_VERSION) +endif + ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys @@ -44,9 +49,13 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - lpddr4_pmu_train_1d_imem,lpddr4_pmu_train_1d_dmem,lpddr4_pmu_train_1d_fw) + lpddr4_pmu_train_1d_imem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_1d_dmem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_1d_fw) $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - lpddr4_pmu_train_2d_imem,lpddr4_pmu_train_2d_dmem,lpddr4_pmu_train_2d_fw) + lpddr4_pmu_train_2d_imem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_2d_dmem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_2d_fw) cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_1d_fw.bin \ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_2d_fw.bin > \ $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin @@ -67,13 +76,17 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # ddr4_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - ddr4_imem_1d_201810,ddr4_dmem_1d_201810,ddr4_1d_201810_fw) + ddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_1d_fw) $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - ddr4_imem_2d_201810,ddr4_dmem_2d_201810,ddr4_2d_201810_fw) - cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_201810_fw.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_201810_fw.bin > \ - $(BINARIES_DIR)/ddr4_201810_fw.bin - ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin + ddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_2d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_fw.bin > \ + $(BINARIES_DIR)/ddr4_fw.bin + ln -sf $(BINARIES_DIR)/ddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin # U-Boot supports creation of the combined flash.bin image. To make # sure that U-Boot can access all available files copy them to @@ -90,10 +103,12 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # ddr3_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - ddr3_imem_1d_201810,ddr3_dmem_1d_201810,ddr3_1d_201810_fw) - cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr3_1d_201810_fw.bin > \ - $(BINARIES_DIR)/ddr3_201810_fw.bin - ln -sf $(BINARIES_DIR)/ddr3_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin + ddr3_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr3_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr3_1d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr3_1d_fw.bin > \ + $(BINARIES_DIR)/ddr3_fw.bin + ln -sf $(BINARIES_DIR)/ddr3_fw.bin $(BINARIES_DIR)/ddr_fw.bin # U-Boot supports creation of the combined flash.bin image. To make # sure that U-Boot can access all available files copy them to From bf85b8e267b5fbbf817408d93435504ab458c01e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 9 Aug 2022 15:27:30 +0200 Subject: [PATCH 082/140] package/libinput: remove python tools scripts Some libinput tools are actually python scripts and requires at least tree python modules: libevdev, pyudev and pyyaml: libinput]$ file * libinput-analyze: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-analyze-per-slot-delta: Python script, UTF-8 Unicode text executable libinput-analyze-recording: Python script, UTF-8 Unicode text executable libinput-analyze-touch-down-state: Python script, UTF-8 Unicode text executable libinput-debug-events: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-debug-tablet: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-list-devices: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-measure: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-measure-fuzz: Python script, UTF-8 Unicode text executable libinput-measure-touchpad-pressure: Python script, UTF-8 Unicode text executable libinput-measure-touchpad-size: Python script, UTF-8 Unicode text executable libinput-measure-touchpad-tap: Python script, UTF-8 Unicode text executable libinput-measure-touch-size: Python script, UTF-8 Unicode text executable libinput-quirks: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-record: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped libinput-replay: Python script, UTF-8 Unicode text executable Since for now we do not have a python-libevdev package, this commit unconditionally removes Python scripts. Signed-off-by: Romain Naour Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/libinput/libinput.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index a66b0afde5..1529411355 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -30,4 +30,21 @@ else LIBINPUT_CONF_OPTS += -Ddebug-gui=false endif +LIBINPUT_PYTHON_TOOLS = libinput-analyze-per-slot-delta \ + libinput-analyze-recording \ + libinput-analyze-touch-down-state \ + libinput-measure-fuzz \ + libinput-measure-touchpad-pressure \ + libinput-measure-touchpad-size \ + libinput-measure-touchpad-tap \ + libinput-measure-touch-size \ + libinput-replay + +define LIBINPUT_REMOVE_UNNEEDED_FILES + $(foreach f,$(LIBINPUT_PYTHON_TOOLS), \ + rm -f $(TARGET_DIR)/usr/libexec/libinput/$(f) + ) +endef +LIBINPUT_POST_INSTALL_TARGET_HOOKS += LIBINPUT_REMOVE_UNNEEDED_FILES + $(eval $(meson-package)) From f0520470951528eb07710338e7427a1fd0159b48 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 9 Aug 2022 15:27:29 +0200 Subject: [PATCH 083/140] package/python-libevdev: new package python-libevdev is needed for libinput replay command: $ libinput replay recording.yml Error: No module named 'libevdev' One or more python modules are missing. Please install those modules and re-run this tool. Indeed only libinput-replay tool is a python script (like libinput-analyze-recording, libinput-measure-fuzz...) python-libevdev itself requires a kernel built with CONFIG_INPUT_UINPUT option enabled, enable this option if a kernel is built by Buildroot. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-libevdev/Config.in | 7 +++++++ package/python-libevdev/python-libevdev.hash | 5 +++++ package/python-libevdev/python-libevdev.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/python-libevdev/Config.in create mode 100644 package/python-libevdev/python-libevdev.hash create mode 100644 package/python-libevdev/python-libevdev.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55b23ebef2..07d719984a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2584,6 +2584,7 @@ F: package/ogre/ F: package/openpowerlink/ F: package/physfs/ F: package/piglit/ +F: package/python-libevdev/ F: package/qemu/ F: package/solarus/ F: package/stress-ng/ diff --git a/package/Config.in b/package/Config.in index 802fb5da30..4bfc12d1d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1095,6 +1095,7 @@ menu "External python modules" source "package/python-kiwisolver/Config.in" source "package/python-lark/Config.in" source "package/python-libconfig/Config.in" + source "package/python-libevdev/Config.in" source "package/python-libusb1/Config.in" source "package/python-lmdb/Config.in" source "package/python-lockfile/Config.in" diff --git a/package/python-libevdev/Config.in b/package/python-libevdev/Config.in new file mode 100644 index 0000000000..2d6aa49ce0 --- /dev/null +++ b/package/python-libevdev/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LIBEVDEV + bool "python-libevdev" + select BR2_PACKAGE_LIBEVDEV # runtime + help + Python wrapper for libevdev. + + https://gitlab.freedesktop.org/libevdev/python-libevdev diff --git a/package/python-libevdev/python-libevdev.hash b/package/python-libevdev/python-libevdev.hash new file mode 100644 index 0000000000..2799078cc8 --- /dev/null +++ b/package/python-libevdev/python-libevdev.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/libevdev/json +md5 34b48098c1fba26de79a0d67a17a588a libevdev-0.11.tar.gz +sha256 e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f libevdev-0.11.tar.gz +# Locally computed sha256 checksums +sha256 a547b196da4e5bb9588a6e24f1f36ae9e2349ca5375e2cf9c315186e237d9f6d COPYING diff --git a/package/python-libevdev/python-libevdev.mk b/package/python-libevdev/python-libevdev.mk new file mode 100644 index 0000000000..e5256064c9 --- /dev/null +++ b/package/python-libevdev/python-libevdev.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-libevdev +# +################################################################################ + +PYTHON_LIBEVDEV_VERSION = 0.11 +PYTHON_LIBEVDEV_SOURCE = libevdev-$(PYTHON_LIBEVDEV_VERSION).tar.gz +PYTHON_LIBEVDEV_SITE = https://files.pythonhosted.org/packages/b0/49/2fe589ce1fa6ca0f05ae0b1717923650f2cc6eec6307c71fbc7789738902 +PYTHON_LIBEVDEV_SETUP_TYPE = setuptools +PYTHON_LIBEVDEV_LICENSE = MIT +PYTHON_LIBEVDEV_LICENSE_FILES = COPYING + +# Requires a kernel built with user level driver support (uinput). +define PYTHON_LIBEVDEV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_MISC) + $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_UINPUT) +endef + +$(eval $(python-package)) From 8bf3d6a1b7f1584344d39e14f6e275cf14b1b4fa Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 9 Aug 2022 15:27:30 +0200 Subject: [PATCH 084/140] package/libinput: enable installation of python tools Now that we have a python-libevdev package, let's allow the installation of the libinput Python tools, using a new BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS option. Signed-off-by: Romain Naour Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/libinput/Config.in | 22 ++++++++++++++++++++++ package/libinput/libinput.mk | 2 ++ 2 files changed, 24 insertions(+) diff --git a/package/libinput/Config.in b/package/libinput/Config.in index 14e4e70f96..1a8fcc7ed4 100644 --- a/package/libinput/Config.in +++ b/package/libinput/Config.in @@ -13,5 +13,27 @@ config BR2_PACKAGE_LIBINPUT http://freedesktop.org/wiki/Software/libinput/ +if BR2_PACKAGE_LIBINPUT + +config BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS + bool "install python tools " + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_LIBEVDEV # runtime + select BR2_PACKAGE_PYTHON_PYUDEV # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime + help + Install python tools: + libinput-analyze-per-slot-delta, + libinput-analyze-recording, + libinput-analyze-touch-down-state, + libinput-measure-fuzz, + libinput-measure-touchpad-pressure, + libinput-measure-touchpad-size, + libinput-measure-touchpad-tap, + libinput-measure-touch-size, + libinput-replay + +endif + comment "libinput needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 1529411355..3454907bab 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -30,6 +30,7 @@ else LIBINPUT_CONF_OPTS += -Ddebug-gui=false endif +ifeq ($(BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS),) LIBINPUT_PYTHON_TOOLS = libinput-analyze-per-slot-delta \ libinput-analyze-recording \ libinput-analyze-touch-down-state \ @@ -46,5 +47,6 @@ define LIBINPUT_REMOVE_UNNEEDED_FILES ) endef LIBINPUT_POST_INSTALL_TARGET_HOOKS += LIBINPUT_REMOVE_UNNEEDED_FILES +endif $(eval $(meson-package)) From dbc8c461e93ce4ced0ac871ca01a2c47bda694fd Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 24 Aug 2022 08:45:48 +0200 Subject: [PATCH 085/140] package/qoriq-rcw: bump to version LSDK-21.08 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/qoriq-rcw/qoriq-rcw.hash | 2 +- package/qoriq-rcw/qoriq-rcw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index 5848799a0c..f34c771d11 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bbb595f0b68beb114620f7aeaff073b90938329e10cd6b36daa9f2087f3119a0 qoriq-rcw-LSDK-20.12-br1.tar.gz +sha256 caa6802f2ba5ea92fd27e7c977749010a91c9091fcc3fe626f96d9cacfba1f0a qoriq-rcw-LSDK-21.08-br1.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 93e660b1dd..0501c36f46 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_RCW_VERSION = LSDK-20.12 +QORIQ_RCW_VERSION = LSDK-21.08 QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw QORIQ_RCW_SITE_METHOD = git QORIQ_RCW_LICENSE = BSD-3-Clause From 86ec2b57f48f90b0d7625c4b2cb25ef7c0047a05 Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Wed, 24 Aug 2022 09:55:42 +0200 Subject: [PATCH 086/140] package/jquery-ui: bump to version 1.13.1 The contents of the license file have changed. It adds the following details: - The code examples are distributed under CC0, but we do not install them. - The files in the node_modules and external directories is provided under its own license, but we do not install those files. Hence, the license remains just MIT. Signed-off-by: Jesse Van Gavere [Thomas: add details on license file change.] Signed-off-by: Thomas Petazzoni --- package/jquery-ui/jquery-ui.hash | 4 ++-- package/jquery-ui/jquery-ui.mk | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package/jquery-ui/jquery-ui.hash b/package/jquery-ui/jquery-ui.hash index 453ecd5521..92bb5312da 100644 --- a/package/jquery-ui/jquery-ui.hash +++ b/package/jquery-ui/jquery-ui.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c76f349930245360f4d1dea672b9a587f8938b536a378e20eeff919f7263f99f jquery-ui-1.10.4.zip -sha256 ef1fdd608b20fbea7ef269ed03bd24e637717cc193971798a394bf2fa983cd53 MIT-LICENSE.txt +sha256 5f063f91df85431e3fea84f5d5709726d6dcd15ee4bf86b0e9a4b134912a5efd jquery-ui-1.13.1.zip +sha256 de33fb695880d0b07615d4b86f78cd43796906959ade5fdfef70968827a0db78 LICENSE.txt diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk index 9284e683f1..98d150bbf3 100644 --- a/package/jquery-ui/jquery-ui.mk +++ b/package/jquery-ui/jquery-ui.mk @@ -4,14 +4,11 @@ # ################################################################################ -JQUERY_UI_VERSION = 1.10.4 -# Use buildroot mirror since upstream switched the zipfile and directory -# structure without bumping/renaming. -# Remember to switch back to jqueryui.com when bumping! -JQUERY_UI_SITE = http://sources.buildroot.net +JQUERY_UI_VERSION = 1.13.1 +JQUERY_UI_SITE = https://jqueryui.com/resources/download JQUERY_UI_SOURCE = jquery-ui-$(JQUERY_UI_VERSION).zip JQUERY_UI_LICENSE = MIT -JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt +JQUERY_UI_LICENSE_FILES = LICENSE.txt define JQUERY_UI_EXTRACT_CMDS $(UNZIP) -d $(@D) $(JQUERY_UI_DL_DIR)/$(JQUERY_UI_SOURCE) @@ -20,15 +17,13 @@ define JQUERY_UI_EXTRACT_CMDS endef define JQUERY_UI_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/ui/minified/jquery-ui.min.js \ + $(INSTALL) -m 0644 -D $(@D)/jquery-ui.min.js \ $(TARGET_DIR)/var/www/jquery-ui.js - $(INSTALL) -m 0644 -D $(@D)/ui/minified/i18n/jquery-ui-i18n.min.js \ - $(TARGET_DIR)/var/www/jquery-ui-i18n.js - $(INSTALL) -m 0644 -D $(@D)/themes/base/minified/jquery-ui.min.css \ + $(INSTALL) -m 0644 -D $(@D)/jquery-ui.min.css \ $(TARGET_DIR)/var/www/jquery-ui.css $(INSTALL) -d $(TARGET_DIR)/var/www/images $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/images \ - $(@D)/themes/base/minified/images/*.png + $(@D)/images/*.png endef $(eval $(generic-package)) From 7f67bd1ca68f0449435c8d31c4ee99e85d156c22 Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Wed, 24 Aug 2022 11:49:00 +0200 Subject: [PATCH 087/140] package/qt6/qt6serialport: new package Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ package/qt6/Config.in | 1 + package/qt6/qt6serialport/Config.in | 11 ++++++ package/qt6/qt6serialport/qt6serialport.hash | 9 +++++ package/qt6/qt6serialport/qt6serialport.mk | 38 ++++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 package/qt6/qt6serialport/Config.in create mode 100644 package/qt6/qt6serialport/qt6serialport.hash create mode 100644 package/qt6/qt6serialport/qt6serialport.mk diff --git a/DEVELOPERS b/DEVELOPERS index 07d719984a..08d24fba5c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1468,6 +1468,9 @@ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ +N: Jesse Van Gavere +F: package/qt6/qt6serialport/ + N: Jianhui Zhao F: package/libuhttpd/ F: package/libuwsc/ diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 86394f49ba..4b2b9a1174 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,5 +39,6 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialport/Config.in b/package/qt6/qt6serialport/Config.in new file mode 100644 index 0000000000..f1fd844f56 --- /dev/null +++ b/package/qt6/qt6serialport/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT6SERIALPORT + bool "qt6serialport" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Serial Port provides the basic functionality, which + includes configuring, I/O operations, getting and setting + the control signals of the RS-232 pinouts. + + https://doc.qt.io/qt-6/qserialport.html diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash new file mode 100644 index 0000000000..9780eb86fe --- /dev/null +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -0,0 +1,9 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtserialport-everywhere-src-6.3.1.tar.xz.sha256 +sha256 4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e qtserialport-everywhere-src-6.3.1.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk new file mode 100644 index 0000000000..01763657b8 --- /dev/null +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# qt6serialport +# +################################################################################ + +QT6SERIALPORT_VERSION = $(QT6_VERSION) +QT6SERIALPORT_SITE = $(QT6_SITE) +QT6SERIALPORT_SOURCE = qtserialport-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALPORT_VERSION).tar.xz +QT6SERIALPORT_INSTALL_STAGING = YES +QT6SERIALPORT_SUPPORTS_IN_SOURCE_BUILD = NO +QT6SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) +QT6SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT6SERIALPORT_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALPORT_DEPENDENCIES = \ + host-pkgconf \ + host-ninja \ + qt6base + +define QT6SERIALPORT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALPORT_BUILDDIR) +endef + +define QT6SERIALPORT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALPORT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) From c9f1ae121e27910ec1f4fae018ca35e916d79ced Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 23 Aug 2022 20:02:28 -0700 Subject: [PATCH 088/140] configs/nitrogen*: update kernel to boundary-imx_5.15.y Also bump linux headers version to 5.15. Based on NXP 5.15.32-2.0.0 release. Signed-off-by: Chris Dimich Signed-off-by: Thomas Petazzoni --- configs/nitrogen6sx_defconfig | 8 ++++---- configs/nitrogen6x_defconfig | 8 ++++---- configs/nitrogen7_defconfig | 8 ++++---- configs/nitrogen8m_defconfig | 8 ++++---- configs/nitrogen8mm_defconfig | 8 ++++---- configs/nitrogen8mn_defconfig | 8 ++++---- configs/nitrogen8mp_defconfig | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 3c2fe0cc7b..0519e9f12e 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # bootloader BR2_TARGET_UBOOT=y @@ -35,8 +35,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 9e1d3ae1bc..31cf97b13e 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -16,8 +16,8 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # bootloader BR2_TARGET_UBOOT=y @@ -34,8 +34,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 0dbced86e9..79156d4482 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -16,8 +16,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # bootloader BR2_TARGET_UBOOT=y @@ -34,8 +34,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index a41e5f04d8..c3f3093b2e 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -49,8 +49,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index a635f8012b..56ec60dda9 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -49,8 +49,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 5c2101441d..9e38629883 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -49,8 +49,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index dc7427c856..5dc47c45e8 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -49,8 +49,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y From 132278e85171fc0691410b09178b81533aaabd96 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 23 Aug 2022 20:02:29 -0700 Subject: [PATCH 089/140] configs/nitrogen*: bump u-boot revision To latest v2020.10 rev (1d21a3d5) Signed-off-by: Chris Dimich Signed-off-by: Thomas Petazzoni --- configs/nitrogen6sx_defconfig | 2 +- configs/nitrogen6x_defconfig | 2 +- configs/nitrogen7_defconfig | 2 +- configs/nitrogen8m_defconfig | 2 +- configs/nitrogen8mm_defconfig | 2 +- configs/nitrogen8mn_defconfig | 2 +- configs/nitrogen8mp_defconfig | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 0519e9f12e..e302fcbba5 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 31cf97b13e..6f7c3bbe99 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 79156d4482..1efcdf6071 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index c3f3093b2e..a6a9526dee 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 56ec60dda9..0130a6a62a 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 9e38629883..50976959c5 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index 5dc47c45e8..a14a024353 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y From 34cf3a15c9da81afb6cab6c56babd5a2096e44ca Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Tue, 23 Aug 2022 19:48:58 -0700 Subject: [PATCH 090/140] toolchain/toolchain-external: update Arm AArch64 toolchain 11.2-2022.02 Updated to gcc 11.2, gdb 11, binutils 2.37, glibc 2.34. See https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads. Signed-off-by: Chris Dimich Signed-off-by: Thomas Petazzoni --- .../toolchain-external-arm-aarch64/Config.in | 4 ++-- .../toolchain-external-arm-aarch64.hash | 6 ++---- .../toolchain-external-arm-aarch64.mk | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 9eb5d64a9d..a2dd252a9c 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,12 +1,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 2021.07" + bool "Arm AArch64 2022.02" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index ca1ea48bcb..c7173324b8 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,4 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz.asc -md5 07bbe2b5277b75ba36a924e9136366a4 gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz -# locally calculated -sha256 1e33d53dea59c8de823bbdfe0798280bdcd138636c7060da9d77a97ded095a84 gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc +sha256 52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3 gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index 356e0810b3..3d340ea0d7 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2021.07 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2022.02 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/11.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-11.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) From f4a78565db49b90d96b5e28cd06e6b07cb0a7e61 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 24 Aug 2022 12:41:17 +0200 Subject: [PATCH 091/140] toolchain/toolchain-external: update Arm AArch64 BE toolchain 11.2-2022.02 Updated to gcc 11.2, gdb 11, binutils 2.37, glibc 2.34. See https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Thomas Petazzoni --- .../toolchain-external-arm-aarch64-be/Config.in | 4 ++-- .../toolchain-external-arm-aarch64-be.hash | 6 ++---- .../toolchain-external-arm-aarch64-be.mk | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index eeb88579fe..dba50595f5 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,12 +1,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 2021.07" + bool "Arm AArch64 BE 2022.02" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index 1079917c98..99a2f1ff22 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,4 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc -md5 54cbaef7db7eb3de27732500f9da9c6f gcc-arm-10.3-2021.07-x86_64-aarch64_be-none-linux-gnu.tar.xz -# locally calculated -sha256 63c34cac07ceadd74620ea87f27af1aa6a6f55c20a5bc116af21a59ddb6b6a6a gcc-arm-10.3-2021.07-x86_64-aarch64_be-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc +sha256 cc834d22fd8eff98d18cf3f464e30f5e4aee0966e51f9e09514e948f1eb9884b gcc-arm-11.2-2022.02-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index 5a6dbc60d5..f98f090327 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2021.07 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2022.02 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/11.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-11.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) From 22d10e294cc9cd30fa8adc3672a337167e6241a3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 24 Aug 2022 13:04:02 +0200 Subject: [PATCH 092/140] toolchain/toolchain-external: update Arm ARM32 toolchain 11.2-2022.02 Updated to gcc 11.2, gdb 11, binutils 2.37, glibc 2.34. See https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Thomas Petazzoni --- .../toolchain-external-arm-arm/Config.in | 8 ++++---- .../toolchain-external-arm-arm.hash | 12 +++++------- .../toolchain-external-arm-arm.mk | 6 +++--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 28c6541406..c595b1c133 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -3,7 +3,7 @@ comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 2021.07" + bool "Arm ARM 2022.02" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_ARM_CPU_HAS_NEON @@ -13,12 +13,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 10.3, - GDB 10.2, glibc 2.33, Binutils 2.36.1. It generates code + Arm toolchain for the ARM architecture. It uses GCC 11.2, + GDB 11, glibc 2.34, Binutils 2.37. It generates code that runs on all Cortex-A profile devices. The code generated uses the hard floating point calling convention, and uses the NEON FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index 1fc2c5de57..3c07237e1d 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,7 +1,5 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz.asc -md5 87ec580b290df2febc7c476f59484635 gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz.asc -md5 0f1c5c90f5c62e1d1066f75fb3e51e21 gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz -# locally calculated -sha256 aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz -sha256 fccd7af76988da2b077f939eb2a78baa9935810918d2bf3f837bc74f52efa825 gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz + +# From https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 c5603772af016008ddacb7e475dc226d0cccdf069925dfded43e452a59774fc3 gcc-arm-11.2-2022.02-aarch64-arm-none-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 8731a4f0e5..1bab088830 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2021.07 -TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2022.02 +TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/11.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-11.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz $(eval $(toolchain-external-package)) From ab105fda88047e21cfcd7e02b85220918b8b134b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Aug 2022 23:56:11 +0200 Subject: [PATCH 093/140] package/serd: bump to version 0.30.14 - Switch to meson-package - Update hash of COPYING (update in year: https://github.com/drobilla/serd/commit/0e7053de7086423484e5a8f2c0db76efba4ed257) https://github.com/drobilla/serd/blob/v0.30.14/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/serd/serd.hash | 6 +++--- package/serd/serd.mk | 12 ++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/package/serd/serd.hash b/package/serd/serd.hash index d64a2aa271..c8a45a0831 100644 --- a/package/serd/serd.hash +++ b/package/serd/serd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig -sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 -sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING +# http://download.drobilla.net/serd-0.30.14.tar.xz.sig +sha256 a14137d47b11d6ad431e78da341ca9737998d9eaccf6a49263d4c8d79fd856e3 serd-0.30.14.tar.xz +sha256 13b62d3705cabee6a21730eb24f773249271c2d95e9ecbab16069e729d4ae147 COPYING diff --git a/package/serd/serd.mk b/package/serd/serd.mk index 85b16f6866..7922e777c8 100644 --- a/package/serd/serd.mk +++ b/package/serd/serd.mk @@ -4,17 +4,13 @@ # ################################################################################ -SERD_VERSION = 0.30.10 +SERD_VERSION = 0.30.14 SERD_SITE = https://download.drobilla.net -SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 +SERD_SOURCE = serd-$(SERD_VERSION).tar.xz SERD_LICENSE = ISC SERD_LICENSE_FILES = COPYING SERD_INSTALL_STAGING = YES -SERD_CONF_OPTS += --largefile --no-coverage +SERD_CONF_OPTS += -Ddocs=disabled -Dstatic=false -Dtests=disabled -ifeq ($(BR2_STATIC_LIBS),y) -SERD_CONF_OPTS += --static --no-shared --static-progs -endif - -$(eval $(waf-package)) +$(eval $(meson-package)) From 075658a88f10636b1448496a9e6e6d9caf949b6f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Aug 2022 23:56:12 +0200 Subject: [PATCH 094/140] package/sord: bump to version 0.16.12 Switch to meson-package and so drop patch https://github.com/drobilla/sord/blob/v0.16.12/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-wscript-add-no-threads-option.patch | 59 ------------------- package/sord/sord.hash | 4 +- package/sord/sord.mk | 16 ++--- 3 files changed, 6 insertions(+), 73 deletions(-) delete mode 100644 package/sord/0001-wscript-add-no-threads-option.patch diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch deleted file mode 100644 index 750ea8f4ad..0000000000 --- a/package/sord/0001-wscript-add-no-threads-option.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 22 Feb 2022 21:22:31 +0100 -Subject: [PATCH] wscript: add -no-threads option - -Add -no-threads options to avoid the following build failure on embedded -toolchains without threads support: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread - -Fixes: - - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/drobilla/sord/pull/3] ---- - wscript | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index fd8578e..d71d78c 100644 ---- a/wscript -+++ b/wscript -@@ -35,6 +35,7 @@ def options(ctx): - {'no-utils': 'do not build command line utilities', - 'static': 'build static library', - 'no-shared': 'do not build shared library', -+ 'no-threads': 'disable threads', - 'static-progs': 'build programs as static binaries'}) - - opt.add_option('--dump', type='string', default='', dest='dump', -@@ -55,6 +56,7 @@ def configure(conf): - - conf.env.BUILD_UTILS = not Options.options.no_utils - conf.env.BUILD_SHARED = not Options.options.no_shared -+ conf.env.ENABLE_THREADS = not Options.options.no_threads - conf.env.STATIC_PROGS = Options.options.static_progs - conf.env.BUILD_STATIC = (Options.options.static or - Options.options.static_progs) -@@ -124,7 +126,7 @@ def configure(conf): - conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') - conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) - -- if conf.env.HAVE_PCRE: -+ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: - if conf.check(cflags=['-pthread'], mandatory=False): - conf.env.PTHREAD_CFLAGS = ['-pthread'] - if conf.env.CC_NAME != 'clang': -@@ -160,6 +162,7 @@ def configure(conf): - conf, - {'Static library': bool(conf.env.BUILD_STATIC), - 'Shared library': bool(conf.env.BUILD_SHARED), -+ 'Threads': bool(conf.env.ENABLE_THREADS), - 'Utilities': bool(conf.env.BUILD_UTILS), - 'Unit tests': bool(conf.env.BUILD_TESTS), - 'Debug dumping': dump}) --- -2.34.1 - diff --git a/package/sord/sord.hash b/package/sord/sord.hash index af175f91f0..ec5c88a43c 100644 --- a/package/sord/sord.hash +++ b/package/sord/sord.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc -sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 +# https://download.drobilla.net/sord-0.16.12.tar.xz.sig +sha256 fde269893cb24b2ab7b75708d7a349c6e760c47a0d967aeca5b1c651294ff9f2 sord-0.16.12.tar.xz sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/sord/sord.mk b/package/sord/sord.mk index c06ef9c55c..9fcf98858a 100644 --- a/package/sord/sord.mk +++ b/package/sord/sord.mk @@ -4,9 +4,9 @@ # ################################################################################ -SORD_VERSION = 0.16.8 +SORD_VERSION = 0.16.12 SORD_SITE = https://download.drobilla.net -SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 +SORD_SOURCE = sord-$(SORD_VERSION).tar.xz SORD_LICENSE = ISC SORD_LICENSE_FILES = COPYING SORD_DEPENDENCIES = host-pkgconf serd @@ -16,14 +16,6 @@ ifeq ($(BR2_PACKAGE_PCRE),y) SORD_DEPENDENCIES += pcre endif -SORD_CONF_OPTS += --no-coverage +SORD_CONF_OPTS += -Ddocs=disabled -Dtests=disabled -ifeq ($(BR2_STATIC_LIBS),y) -SORD_CONF_OPTS += --static --no-shared --static-progs -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -SORD_CONF_OPTS += --no-threads -endif - -$(eval $(waf-package)) +$(eval $(meson-package)) From 472b628a1450524e4e32079518067414948b5e11 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 9 Aug 2022 00:06:03 +0200 Subject: [PATCH 095/140] package/openblas: bump to version v0.3.21 For change log since v0.3.20, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.21 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index 71fc4d34c5..3a52600056 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz +sha256 f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca openblas-0.3.21.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 085d32acc3..ac40c57afb 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.20 +OPENBLAS_VERSION = 0.3.21 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From 98a3fba9402a84d00762eeeeb7086f855d8a0d0f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 6 Aug 2022 23:56:40 +0200 Subject: [PATCH 096/140] support/scripts/pkg-stats: remove useless escaping of double quotes Within single-quoted f-strings, and within triple double quoted strings, escaping all the double quotes is completely useless and makes the code more difficult to read. Get rid of all this useless escaping. The renderer HTML is exactly identical before/after this commit. Signed-off-by: Thomas Petazzoni Tested-By: Sen Hastings Acked-By: Sen Hastings --- support/scripts/pkg-stats | 100 +++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index d32abd7225..572757b7ea 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -886,7 +886,7 @@ function expandField(fieldId){ -Results
+Results
""" # noqa - tabs and spaces @@ -920,8 +920,8 @@ def boolean_str(b): def dump_html_pkg(f, pkg): pkg_css_class = pkg.path.replace("/", "_")[:-3] - f.write(f'
{pkg.path}
\n') + f.write(f'
{pkg.path}
\n') # Patch count data_field_id = f'patch_count__{pkg_css_class}' div_class = ["centered patch_count data"] @@ -932,8 +932,8 @@ def dump_html_pkg(f, pkg): div_class.append("somepatches") else: div_class.append("lotsofpatches") - f.write(f'
{str(pkg.patch_count)}
\n') + f.write(f'
{str(pkg.patch_count)}
\n') # Infrastructure data_field_id = f'infrastructure__{pkg_css_class}' @@ -944,8 +944,8 @@ def dump_html_pkg(f, pkg): div_class.append("wrong") else: div_class.append("correct") - f.write(f'
{infra_str(pkg.infras)}
\n') + f.write(f'
{infra_str(pkg.infras)}
\n') # License data_field_id = f'license__{pkg_css_class}' @@ -955,8 +955,8 @@ def dump_html_pkg(f, pkg): div_class.append("correct") else: div_class.append("wrong") - f.write(f'
{boolean_str(pkg.is_status_ok("license"))}
\n') + f.write(f'
{boolean_str(pkg.is_status_ok("license"))}
\n') # License files data_field_id = f'license_files__{pkg_css_class}' @@ -966,8 +966,8 @@ def dump_html_pkg(f, pkg): div_class.append("correct") else: div_class.append("wrong") - f.write(f'
{boolean_str(pkg.is_status_ok("license-files"))}
\n') + f.write(f'
{boolean_str(pkg.is_status_ok("license-files"))}
\n') # Hash data_field_id = f'hash_file__{pkg_css_class}' @@ -977,8 +977,8 @@ def dump_html_pkg(f, pkg): div_class.append("correct") else: div_class.append("wrong") - f.write(f'
{boolean_str(pkg.is_status_ok("hash"))}
\n') + f.write(f'
{boolean_str(pkg.is_status_ok("hash"))}
\n') # Current version data_field_id = f'current_version__{pkg_css_class}' @@ -986,8 +986,8 @@ def dump_html_pkg(f, pkg): current_version = pkg.current_version[:20] + "..." else: current_version = pkg.current_version - f.write(f'
{current_version}
\n') + f.write(f'
{current_version}
\n') # Latest version data_field_id = f'latest_version__{pkg_css_class}' @@ -1020,7 +1020,7 @@ def dump_html_pkg(f, pkg): else: latest_version_text += "found by guess" - f.write(f'
{latest_version_text}
\n') + f.write(f'
{latest_version_text}
\n') # Warnings data_field_id = f'warnings__{pkg_css_class}' @@ -1030,7 +1030,7 @@ def dump_html_pkg(f, pkg): div_class.append("correct") else: div_class.append("wrong") - f.write(f'
{pkg.warnings}
\n') + f.write(f'
{pkg.warnings}
\n') # URL status data_field_id = f'upstream_url__{pkg_css_class}' @@ -1045,7 +1045,7 @@ def dump_html_pkg(f, pkg): else: div_class.append("good_url") url_str = "Link" % pkg.url - f.write(f'
{url_str}
\n') + f.write(f'
{url_str}
\n') # CVEs data_field_id = f'cves__{pkg_css_class}' @@ -1061,11 +1061,11 @@ def dump_html_pkg(f, pkg): div_class.append("cve-ok") else: div_class.append("cve-unknown") - f.write(f'
\n') + f.write(f'
\n') if len(pkg.cves) > 10: cve_total = len(pkg.cves) + 1 - f.write(f'
see all ({cve_total}) ▾
\n') + f.write(f'
see all ({cve_total}) ▾
\n') if pkg.is_status_error("cve"): for cve in pkg.cves: f.write(" %s
\n" % (cve, cve)) @@ -1083,7 +1083,7 @@ def dump_html_pkg(f, pkg): div_class.append(f'_{pkg_css_class}') if pkg.ignored_cves: div_class.append("cve_ignored") - f.write(f'
\n') + f.write(f'
\n') for ignored_cve in pkg.ignored_cves: f.write(" %s
\n" % (ignored_cve, ignored_cve)) f.write("
\n") @@ -1100,7 +1100,7 @@ def dump_html_pkg(f, pkg): div_class.append("cpe-ok") else: div_class.append("cpe-unknown") - f.write(f'
\n') + f.write(f'
\n') if pkg.cpeid: cpeid_begin = ":".join(pkg.cpeid.split(":")[0:4]) + ":" cpeid_formatted = pkg.cpeid.replace(cpeid_begin, cpeid_begin + "") @@ -1121,33 +1121,33 @@ def dump_html_pkg(f, pkg): def dump_html_all_pkgs(f, packages): f.write(""" -
-
Package
-
Patch count
-
Infrastructure
-
License
-
License files
-
Hash file
-
Current version
-
Latest version
-
Warnings
-
Upstream URL
-
CVEs
-
CVEs Ignored
-
CPE ID
+
+
Package
+
Patch count
+
Infrastructure
+
License
+
License files
+
Hash file
+
Current version
+
Latest version
+
Warnings
+
Upstream URL
+
CVEs
+
CVEs Ignored
+
CPE ID
""") for pkg in sorted(packages): dump_html_pkg(f, pkg) From d68628a5382844a40856be486cd41dbfb0c7cabb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 6 Aug 2022 23:56:41 +0200 Subject: [PATCH 097/140] support/scripts/pkg-stats: remove remaining double quote escaping This is done either by switching to single quoted f-strings, triple double quoted f-strings when needed, or simply single-quoted strings. The renderer HTML is exactly identical before/after this commit. Signed-off-by: Thomas Petazzoni Tested-By: Sen Hastings Acked-By: Sen Hastings --- support/scripts/pkg-stats | 67 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 572757b7ea..aa3b49c809 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1010,13 +1010,12 @@ def dump_html_pkg(f, pkg): if pkg.latest_version['version'] is None: latest_version_text = "Found, but no version" else: - latest_version_text = "%s" % \ - (pkg.latest_version['id'], str(pkg.latest_version['version'])) + latest_version_text = f"""{str(pkg.latest_version['version'])}""" latest_version_text += "
" if pkg.latest_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO: - latest_version_text += "found by distro" + latest_version_text += f'found by distro' else: latest_version_text += "found by guess" @@ -1041,10 +1040,10 @@ def dump_html_pkg(f, pkg): div_class.append("missing_url") if pkg.status['url'][0] == "error": div_class.append("invalid_url") - url_str = "%s" % (pkg.url, pkg.status['url'][1]) + url_str = f"""{pkg.status['url'][1]}""" else: div_class.append("good_url") - url_str = "Link" % pkg.url + url_str = f'Link' f.write(f'
{url_str}
\n') # CVEs @@ -1068,11 +1067,11 @@ def dump_html_pkg(f, pkg): class="see-more centered cve_ignored">see all ({cve_total}) ▾
\n') if pkg.is_status_error("cve"): for cve in pkg.cves: - f.write(" %s
\n" % (cve, cve)) + f.write(f' {cve}
\n') for cve in pkg.unsure_cves: - f.write(" %s (unsure)
\n" % (cve, cve)) + f.write(f' {cve} (unsure)
\n') elif pkg.is_status_na("cve"): - f.write(" %s" % pkg.status['cve'][1]) + f.write(f""" {pkg.status['cve'][1]}""") else: f.write(" N/A\n") f.write("
\n") @@ -1085,7 +1084,7 @@ def dump_html_pkg(f, pkg): div_class.append("cve_ignored") f.write(f'
\n') for ignored_cve in pkg.ignored_cves: - f.write(" %s
\n" % (ignored_cve, ignored_cve)) + f.write(f' {ignored_cve}
\n') f.write("
\n") # CPE ID @@ -1108,11 +1107,9 @@ def dump_html_pkg(f, pkg): if not pkg.is_status_ok("cpe"): if pkg.is_actual_package and pkg.current_version: if pkg.cpeid: - f.write("
%s (Search)\n" % # noqa: E501 - (pkg.status['cpe'][1], ":".join(pkg.cpeid.split(":")[0:5]))) + f.write(f"""
{pkg.status['cpe'][1]} (Search)\n""") # noqa: E501 else: - f.write(" %s (Search)\n" % # noqa: E501 - (pkg.status['cpe'][1], pkg.name)) + f.write(f""" {pkg.status['cpe'][1]} (Search)\n""") # noqa: E501 else: f.write(" %s\n" % pkg.status['cpe'][1]) @@ -1155,49 +1152,49 @@ def dump_html_all_pkgs(f, packages): def dump_html_stats(f, stats): - f.write("\n") - f.write("
\n") + f.write('\n') + f.write('
\n') infras = [infra[6:] for infra in stats.keys() if infra.startswith("infra-")] for infra in infras: - f.write("
Packages using the %s infrastructure
%s
\n" % + f.write('
Packages using the %s infrastructure
%s
\n' % (infra, stats["infra-%s" % infra])) - f.write("
Packages having license information
%s
\n" % + f.write('
Packages having license information
%s
\n' % stats["license"]) - f.write("
Packages not having license information
%s
\n" % + f.write('
Packages not having license information
%s
\n' % stats["no-license"]) - f.write("
Packages having license files information
%s
\n" % + f.write('
Packages having license files information
%s
\n' % stats["license-files"]) - f.write("
Packages not having license files information
%s
\n" % + f.write('
Packages not having license files information
%s
\n' % stats["no-license-files"]) - f.write("
Packages having a hash file
%s
\n" % + f.write('
Packages having a hash file
%s
\n' % stats["hash"]) - f.write("
Packages not having a hash file
%s
\n" % + f.write('
Packages not having a hash file
%s
\n' % stats["no-hash"]) - f.write("
Total number of patches
%s
\n" % + f.write('
Total number of patches
%s
\n' % stats["patches"]) - f.write("
Packages having a mapping on release-monitoring.org
%s
\n" % + f.write('
Packages having a mapping on release-monitoring.org
%s
\n' % stats["rmo-mapping"]) - f.write("
Packages lacking a mapping on release-monitoring.org
%s
\n" % + f.write('
Packages lacking a mapping on release-monitoring.org
%s
\n' % stats["rmo-no-mapping"]) - f.write("
Packages that are up-to-date
%s
\n" % + f.write('
Packages that are up-to-date
%s
\n' % stats["version-uptodate"]) - f.write("
Packages that are not up-to-date
%s
\n" % + f.write('
Packages that are not up-to-date
%s
\n' % stats["version-not-uptodate"]) - f.write("
Packages with no known upstream version
%s
\n" % + f.write('
Packages with no known upstream version
%s
\n' % stats["version-unknown"]) - f.write("
Packages affected by CVEs
%s
\n" % + f.write('
Packages affected by CVEs
%s
\n' % stats["pkg-cves"]) - f.write("
Total number of CVEs affecting all packages
%s
\n" % + f.write('
Total number of CVEs affecting all packages
%s
\n' % stats["total-cves"]) - f.write("
Packages affected by unsure CVEs
%s
\n" % + f.write('
Packages affected by unsure CVEs
%s
\n' % stats["pkg-unsure-cves"]) - f.write("
Total number of unsure CVEs affecting all packages
%s
\n" % + f.write('
Total number of unsure CVEs affecting all packages
%s
\n' % stats["total-unsure-cves"]) - f.write("
Packages with CPE ID
%s
\n" % + f.write('
Packages with CPE ID
%s
\n' % stats["cpe-id"]) - f.write("
Packages without CPE ID
%s
\n" % + f.write('
Packages without CPE ID
%s
\n' % stats["no-cpe-id"]) - f.write("
\n") + f.write('
\n') def dump_html_gen_info(f, date, commit): From 3c09118dc42f48156376527665a38d1cbb871a38 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 25 Aug 2022 12:52:34 -0700 Subject: [PATCH 098/140] package/gobject-introspection: bump version to 1.72.0 - Remove upstreamed patch 0004-build-Avoid-the-doctemplates-hack.patch. - Update license hashes due to address changes. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- .../0001-disable-tests.patch | 2 +- ...04-build-Avoid-the-doctemplates-hack.patch | 221 ------------------ .../gobject-introspection.hash | 8 +- .../gobject-introspection.mk | 2 +- 4 files changed, 6 insertions(+), 227 deletions(-) delete mode 100644 package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index ed2d9d6fc0..390707c10a 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -225,12 +225,6 @@ else +@@ -232,12 +232,6 @@ else endif subdir('docs') diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch deleted file mode 100644 index 0b70b5c4c0..0000000000 --- a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 11 Jan 2022 15:51:10 +0000 -Subject: [PATCH] build: Avoid the doctemplates hack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The hack that copies the doctemplates directory into the build -directory has stopped working with newer versions of Meson; while it's -possible to copy files, custom_target() cannot depend on a directory. -Additionally, the dependency has always been broken. - -Instead, we enumerate the template files—after all, it's not like they -change a lot—and then we list them as dependencies for the test targets. - -Fixes: #414 - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -effb1e09dee263cdac4ec593e8caf316e6f01fe2] ---- - giscanner/doctemplates/devdocs/meson.build | 19 +++++++ - giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ - giscanner/meson.build | 14 ++--- - tests/scanner/meson.build | 24 +++++---- - 4 files changed, 98 insertions(+), 22 deletions(-) - create mode 100644 giscanner/doctemplates/devdocs/meson.build - create mode 100644 giscanner/doctemplates/mallard/meson.build - -diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build -new file mode 100644 -index 00000000..2037182a ---- /dev/null -+++ b/giscanner/doctemplates/devdocs/meson.build -@@ -0,0 +1,19 @@ -+doc_templates += files([ -+ 'Gjs/_doc.tmpl', -+ 'Gjs/_index.tmpl', -+ 'Gjs/_method.tmpl', -+ 'Gjs/_methods.tmpl', -+ 'Gjs/_properties.tmpl', -+ 'Gjs/_signals.tmpl', -+ 'Gjs/_staticmethods.tmpl', -+ 'Gjs/_vfuncs.tmpl', -+ 'Gjs/base.tmpl', -+ 'Gjs/callback.tmpl', -+ 'Gjs/class.tmpl', -+ 'Gjs/default.tmpl', -+ 'Gjs/enum.tmpl', -+ 'Gjs/function.tmpl', -+ 'Gjs/interface.tmpl', -+ 'Gjs/method.tmpl', -+ 'Gjs/namespace.tmpl', -+]) -diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build -new file mode 100644 -index 00000000..5fe4e2af ---- /dev/null -+++ b/giscanner/doctemplates/mallard/meson.build -@@ -0,0 +1,63 @@ -+base_templates = files([ -+ 'base.tmpl', -+ 'class.tmpl', -+ 'namespace.tmpl', -+]) -+ -+c_templates = files([ -+ 'C/callback.tmpl', -+ 'C/class.tmpl', -+ 'C/constructor.tmpl', -+ 'C/default.tmpl', -+ 'C/enum.tmpl', -+ 'C/field.tmpl', -+ 'C/function.tmpl', -+ 'C/interface.tmpl', -+ 'C/method.tmpl', -+ 'C/namespace.tmpl', -+ 'C/property.tmpl', -+ 'C/record.tmpl', -+ 'C/signal.tmpl', -+ 'C/vfunc.tmpl', -+]) -+ -+gjs_templates = files([ -+ 'Gjs/callback.tmpl', -+ 'Gjs/class.tmpl', -+ 'Gjs/constructor.tmpl', -+ 'Gjs/default.tmpl', -+ 'Gjs/enum.tmpl', -+ 'Gjs/field.tmpl', -+ 'Gjs/function.tmpl', -+ 'Gjs/interface.tmpl', -+ 'Gjs/method.tmpl', -+ 'Gjs/namespace.tmpl', -+ 'Gjs/property.tmpl', -+ 'Gjs/record.tmpl', -+ 'Gjs/signal.tmpl', -+ 'Gjs/vfunc.tmpl', -+]) -+ -+py_templates = files([ -+ 'Python/callback.tmpl', -+ 'Python/class.tmpl', -+ 'Python/constructor.tmpl', -+ 'Python/default.tmpl', -+ 'Python/enum.tmpl', -+ 'Python/field.tmpl', -+ 'Python/function.tmpl', -+ 'Python/interface.tmpl', -+ 'Python/method.tmpl', -+ 'Python/namespace.tmpl', -+ 'Python/property.tmpl', -+ 'Python/record.tmpl', -+ 'Python/signal.tmpl', -+ 'Python/vfunc.tmpl', -+]) -+ -+doc_templates += [ -+ base_templates, -+ c_templates, -+ gjs_templates, -+ py_templates, -+] -diff --git a/giscanner/meson.build b/giscanner/meson.build -index 41edcd44..3d7dc678 100644 ---- a/giscanner/meson.build -+++ b/giscanner/meson.build -@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', - - install_subdir('doctemplates', install_dir: giscannerdir) - --# XXX: this doesn't track the input, but there is nothing to copy many files --# in meson. --doc_templates = custom_target('copy-templates', -- input : 'doctemplates', -- output : 'doctemplates', -- command : [ -- python, '-c', -- 'import sys, shutil;' + -- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + -- 'shutil.copytree(sys.argv[1], sys.argv[2])', -- '@INPUT@', '@OUTPUT@']) -+doc_templates = [] -+subdir('doctemplates/devdocs') -+subdir('doctemplates/mallard') - - flex = find_program('flex', 'win_flex') - bison = find_program('bison', 'win_bison') -diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build -index 5176b957..b81b3fd5 100644 ---- a/tests/scanner/meson.build -+++ b/tests/scanner/meson.build -@@ -525,19 +525,26 @@ foreach gir : test_girs - endforeach - - if has_girdoctool and glib_dep.type_name() == 'pkgconfig' -+ doctool_env = environment() -+ doctool_env.set('srcdir', meson.current_source_dir()) -+ doctool_env.set('builddir', meson.current_build_dir()) -+ - foreach language : ['C', 'Python', 'Gjs'] - regress_docs = custom_target( - 'generate-docs-' + language, - input: regress_gir, -- depends: [doc_templates], -+ depend_files: doc_templates, - build_by_default: not cairo_deps_found, -+ env: doctool_env, - output: 'Regress-1.0-' + language, - command: [ - python, girdoctool, - '--add-include-path=' + join_paths(build_root, 'gir'), - '--add-include-path=' + meson.current_build_dir(), - '--language', language, -- '@INPUT@', '-o', '@OUTPUT@'], -+ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), -+ '@INPUT@', '-o', '@OUTPUT@', -+ ], - ) - - if cairo_deps_found -@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' - python, - args: [gi_tester, 'Regress-1.0-' + language], - depends: [regress_docs], -- env: [ -- 'srcdir=' + meson.current_source_dir(), -- 'builddir=' + meson.current_build_dir(), -- ], -+ env: doctool_env, - ) - endif - endforeach -@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' - regress_sections = custom_target( - 'generate-docs-sections', - input: regress_gir, -- depends: [doc_templates], -+ depend_files: [doc_templates], - build_by_default: not cairo_deps_found, - output: 'Regress-1.0-sections.txt', -+ env: doctool_env, - command: [ - python, girdoctool, - '--add-include-path=' + join_paths(build_root, 'gir'), -@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' - python, - args: [gi_tester, 'Regress-1.0-sections.txt'], - depends: [regress_sections], -- env: [ -- 'srcdir=' + meson.current_source_dir(), -- 'builddir=' + meson.current_build_dir(), -- ], -+ env: doctool_env, - ) - endif - endif --- -2.25.1 - diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index 5b76df6b40..8f9d323d9a 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum -sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.72.0.sha256sum +sha256 02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc gobject-introspection-1.72.0.tar.xz +sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL +sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 41d64171a7..c8ad9b3c72 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.72 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz From 7a4d4380009e96701ae7c05364d0fccbd43afe02 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Fri, 26 Aug 2022 08:59:34 -0700 Subject: [PATCH 099/140] package/network-manager: needs host-libxslt Besides, order depends alphabetically. Fixes: output/build/network-manager-1.36.4/meson.build:89:0: ERROR: Program 'xsltproc' not found or not executable See: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb?h=kirkstone#n13 Cc: James Hilliard Signed-off-by: TIAN Yuanhao Reviewed-by: James Hilliard [yann.morin.1998@free.fr: one-item per-line in multiline assignment] Signed-off-by: Yann E. MORIN --- package/network-manager/network-manager.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index d782370082..a3bcd4dab8 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,14 +9,23 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 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 -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ - host-intltool libndp util-linux NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager +NETWORK_MANAGER_DEPENDENCIES = \ + host-intltool \ + host-libxslt \ + host-pkgconf \ + dbus \ + gnutls \ + libglib2 \ + libndp \ + udev \ + util-linux + NETWORK_MANAGER_CONF_OPTS = \ -Dintrospection=false \ -Ddocs=false \ From c9e4a70dc2725c07e80cc74b7f325aba0f484e27 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 26 Aug 2022 22:08:55 -0700 Subject: [PATCH 100/140] rtl8812au-aircrack-ng: bump to latest rev e7a4a3 Fixes build against kernel 5.19.x. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- 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 0e61e95780..bc3a926314 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 ad30e61bc3100861b995617672193ab027ec51061dfe1fea9f8625b99cd27995 rtl8812au-aircrack-ng-4ab079f7cb172740c7abc8cbd6e6383bef0f65dc.tar.gz +sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.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 111fd520a4..60d81469c2 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 = 4ab079f7cb172740c7abc8cbd6e6383bef0f65dc +RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 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 89d764720db365f55f725db1e2beecd134276c21 Mon Sep 17 00:00:00 2001 From: Andrea Daoud Date: Thu, 25 Aug 2022 23:26:09 +0800 Subject: [PATCH 101/140] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.65 bluez 5.65 contains various fixes. Signed-off-by: Andrea Daoud Signed-off-by: Yann E. MORIN --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 2f3a290ea8..565511120f 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.64 +BLUEZ5_UTILS_HEADERS_VERSION = 5.65 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/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 0324dd2d77..e0c9f3cdb9 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 ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 bluez-5.64.tar.xz +sha256 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.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 8e2c657899..76070dc3a9 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.64 +BLUEZ5_UTILS_VERSION = 5.65 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES From 6fc91c4359eab23a9f4a655392a40fb79d482a48 Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Tue, 14 Jun 2022 20:01:52 +0200 Subject: [PATCH 102/140] package/slirp4netns: new package slirp4netns is for user-mode networking for unprivileged network namespace. Signed-off-by: Raphael Pavlidis Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/slirp4netns/Config.in | 20 ++++++++++++++++++++ package/slirp4netns/slirp4netns.hash | 3 +++ package/slirp4netns/slirp4netns.mk | 15 +++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 package/slirp4netns/Config.in create mode 100644 package/slirp4netns/slirp4netns.hash create mode 100644 package/slirp4netns/slirp4netns.mk diff --git a/package/Config.in b/package/Config.in index 4bfc12d1d1..57c0e7959a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1939,6 +1939,7 @@ menu "Networking" source "package/rtmpdump/Config.in" source "package/siproxd/Config.in" source "package/slirp/Config.in" + source "package/slirp4netns/Config.in" source "package/snmppp/Config.in" source "package/sofia-sip/Config.in" source "package/sysrepo/Config.in" diff --git a/package/slirp4netns/Config.in b/package/slirp4netns/Config.in new file mode 100644 index 0000000000..22414dfbc9 --- /dev/null +++ b/package/slirp4netns/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SLIRP4NETNS + bool "slirp4netns" + depends on BR2_USE_MMU # libcap, libglib2, slirp + depends on BR2_USE_WCHAR # libglib2, slirp + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, slirp + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSECCOMP + select BR2_PACKAGE_SLIRP + help + User-mode networking for unprivileged network namespaces. + + https://github.com/rootless-containers/slirp4netns + +comment "slirp4netns needs a toolchain w/ wchar, threads, headers >= 3.17" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash new file mode 100644 index 0000000000..e3115c1be0 --- /dev/null +++ b/package/slirp4netns/slirp4netns.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727 slirp4netns-1.2.0.tar.gz +sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk new file mode 100644 index 0000000000..7ff594cc44 --- /dev/null +++ b/package/slirp4netns/slirp4netns.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# slirp4netns +# +################################################################################ + +SLIRP4NETNS_VERSION = 1.2.0 +SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) +SLIRP4NETNS_LICENSE = GPL-2.0 +SLIRP4NETNS_LICENSE_FILES = COPYING +SLIRP4NETNS_DEPENDENCIES = libcap libglib2 libseccomp slirp + +SLIRP4NETNS_AUTORECONF = YES + +$(eval $(autotools-package)) From 294339cb743b56255a209eac8a71fc68ac92e471 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 27 Aug 2022 14:07:12 +0200 Subject: [PATCH 103/140] DEVELOPERS: add Raphael for slirp4netns Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 08d24fba5c..54e1c1fe7b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2513,6 +2513,9 @@ F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py +N: Raphael Pavlidis +F: package/slirp4netns/ + N: Refik Tuzakli F: package/freescale-imx/ F: package/paho-mqtt-cpp/ From 30c1aa539ba8d787312f5941b3711a026b714072 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 24 Aug 2022 15:26:01 +0300 Subject: [PATCH 104/140] package/wpebackend-fdo: bump to version 1.12.1 This minor release fixes a crash. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.12.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 06289900b0..49c60fce0f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.0.tar.xz.sums -md5 c43b34a4b4933bcd80068ae5776ee346 wpebackend-fdo-1.12.0.tar.xz -sha1 e2576d564bd6d9a86737a4cd31dd5827ebc00fdf wpebackend-fdo-1.12.0.tar.xz -sha256 6239c9c15523410798d66315de6b491712ab30009ba180f3e0dd076d9b0074ac wpebackend-fdo-1.12.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz.sums +md5 494f4a5b2bd89dacef37b69534b2e1ce wpebackend-fdo-1.12.1.tar.xz +sha1 72a85e4615e085926f7ad8fc8414f9c6a878ef28 wpebackend-fdo-1.12.1.tar.xz +sha256 45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629 wpebackend-fdo-1.12.1.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 5fe9c5397f..2e2bdee94e 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.12.0 +WPEBACKEND_FDO_VERSION = 1.12.1 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From 4f903c9ba8f4f68df530b3de43247865f59d1b77 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 24 Aug 2022 16:18:26 +0300 Subject: [PATCH 105/140] package/cog: bump to version 0.14.0 This new version includes many improvements. Release notes: https://wpewebkit.org/release/cog-0.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 00d3a4e191..3fd480c2a8 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.4.tar.xz.sums -md5 cdb8acdc3acc9b5082e7db9c279155c3 cog-0.12.4.tar.xz -sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz -sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz +# From https://wpewebkit.org/releases/cog-0.14.0.tar.xz.sums +md5 2352aaba1a4ff31b1d1fb559c4941a01 cog-0.14.0.tar.xz +sha1 2da37ea6c25e45425aa80de4a129484ee226dd96 cog-0.14.0.tar.xz +sha256 e23936f1ce350ea5ea6fa0709b63d34776b05709388aed9c6cf3fdc41299de9f cog-0.14.0.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 95b6220629..348c17c336 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.4 +COG_VERSION = 0.14.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From 6c7061f3a855d789a225a78ec0c96882463c8c17 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 27 Aug 2022 22:58:18 +0200 Subject: [PATCH 106/140] support/scripts/pkg-stats: fix flake8 errors Fixes flake8 errors: support/scripts/pkg-stats:1013:133: E501 line too long (164 > 132 characters) support/scripts/pkg-stats:1018:36: F541 f-string is missing placeholders support/scripts/pkg-stats:1110:199: E261 at least two spaces before inline comment For the first and the last one, we chose to split the long lines rather than adding noqa: 501. Indeed, the long lines make it very unreadable, and there are relatively natural places where the line can be broken. Also split a line just below the second one in a similar way. The f-string on 1018 doesn't need to be an f-string. Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index aa3b49c809..3248e3678d 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1010,12 +1010,13 @@ def dump_html_pkg(f, pkg): if pkg.latest_version['version'] is None: latest_version_text = "Found, but no version" else: - latest_version_text = f"""{str(pkg.latest_version['version'])}""" + latest_version_text = f"""""" \ + f"""{str(pkg.latest_version['version'])}""" latest_version_text += "
" if pkg.latest_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO: - latest_version_text += f'found by distro' + latest_version_text += 'found by distro' else: latest_version_text += "found by guess" @@ -1107,9 +1108,11 @@ def dump_html_pkg(f, pkg): if not pkg.is_status_ok("cpe"): if pkg.is_actual_package and pkg.current_version: if pkg.cpeid: - f.write(f"""
{pkg.status['cpe'][1]} (Search)\n""") # noqa: E501 + f.write(f"""
{pkg.status['cpe'][1]} (Search)\n""") else: - f.write(f""" {pkg.status['cpe'][1]} (Search)\n""") # noqa: E501 + f.write(f""" {pkg.status['cpe'][1]} (Search)\n""") else: f.write(" %s\n" % pkg.status['cpe'][1]) From 836f49e7f9c6a536e6ddb96fff541b4373eabb02 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Aug 2022 23:00:28 +0200 Subject: [PATCH 107/140] package/libxslt: bump to version 1.1.36 https://gitlab.gnome.org/GNOME/libxslt/-/tags/v1.1.36 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 39523a6953..8d1a2af193 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.35.sha256sum -sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.36.sha256sum +sha256 12848f0a4408f65b530d3962cd9ff670b6ae796191cfeff37522b5772de8dc8e libxslt-1.1.36.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index df0286e986..d908e3c552 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.35 +LIBXSLT_VERSION = 1.1.36 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From 8fe5de96f700bc93b64c61e6e4075555f025fa1f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Aug 2022 10:40:32 +0200 Subject: [PATCH 108/140] package/poco: bump version to 1.12.2 poco 1.12.0 updated its pcre depencency to pcre2, see: https://github.com/pocoproject/poco/blob/poco-1.12.2-release/CHANGELOG#L37 The Kconfig selection and dependencies are updated accordingly. This commit also reorder those Kconfig options alphabetically. This commit adds an upstream patch to fix compilation failure with oracle-mysql. See: https://github.com/pocoproject/poco/commit/3884c734c261231c34f59e56cde7ae02945b4dae This commit also adds "-latomic" to ldflags at configuration time, if the toolchain has it. This is required for some architecture: without this, compilation with bootlin-riscv64-glibc toolchain (for example) fails at link time with undefined reference to '__atomic_exchange_1'. The --ldflags option was introduced in 1.12.0 (Thanks Fabrice). See: https://github.com/pocoproject/poco/pull/3545 For the full Poco change log since 1.11.12, see: https://github.com/pocoproject/poco/blob/poco-1.12.2-release/CHANGELOG Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- ...optional-JSON-support-for-MySQL-3753.patch | 45 +++++++++++++++++++ package/poco/Config.in | 2 +- package/poco/poco.hash | 2 +- package/poco/poco.mk | 10 ++++- 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch diff --git a/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch new file mode 100644 index 0000000000..ba2f073a59 --- /dev/null +++ b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch @@ -0,0 +1,45 @@ +From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001 +From: Hernan Martinez +Date: Tue, 16 Aug 2022 23:07:25 -0500 +Subject: [PATCH] Fix optional JSON support for MySQL (#3753) + +* Fix optional JSON support for MySQL + +* Fix optional JSON support for MySQLTest +--- + Data/MySQL/src/ResultMetadata.cpp | 2 ++ + Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp +index 61b49dd54..adb5dae84 100644 +--- a/Data/MySQL/src/ResultMetadata.cpp ++++ b/Data/MySQL/src/ResultMetadata.cpp +@@ -133,8 +133,10 @@ namespace + case MYSQL_TYPE_LONG_BLOB: + case MYSQL_TYPE_BLOB: + return Poco::Data::MetaColumn::FDT_BLOB; ++#ifdef POCO_MYSQL_JSON + case MYSQL_TYPE_JSON: + return Poco::Data::MetaColumn::FDT_JSON; ++#endif + default: + return Poco::Data::MetaColumn::FDT_UNKNOWN; + } +diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp +index 80a3683b1..2a286d35e 100644 +--- a/Data/MySQL/testsuite/src/MySQLTest.cpp ++++ b/Data/MySQL/testsuite/src/MySQLTest.cpp +@@ -976,7 +976,9 @@ CppUnit::Test* MySQLTest::suite() + CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); + CppUnit_addTest(pSuite, MySQLTest, testLongBLOB); + CppUnit_addTest(pSuite, MySQLTest, testLongTEXT); ++#ifdef POCO_MYSQL_JSON + CppUnit_addTest(pSuite, MySQLTest, testJSON); ++#endif + CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts); + CppUnit_addTest(pSuite, MySQLTest, testFloat); + CppUnit_addTest(pSuite, MySQLTest, testDouble); +-- +2.37.2 + diff --git a/package/poco/Config.in b/package/poco/Config.in index 95f9a46e6e..cb447960f1 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -17,8 +17,8 @@ config BR2_PACKAGE_POCO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE help The C++ Portable Components Libraries diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 4bf20f3f6b..eea3e2494a 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9774651a02e4cfa79fc43b7db617e45d353ede00b7be8afd0e74e6afb23d3793 poco-1.11.2.tar.gz +sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index c06e55210e..3bcc42c455 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,14 +4,14 @@ # ################################################################################ -POCO_VERSION = 1.11.2 +POCO_VERSION = 1.12.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = pcre zlib \ +POCO_DEPENDENCIES = pcre2 zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ @@ -60,11 +60,17 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) POCO_MAKE_TARGET = all_release endif +POCO_LDFLAGS=$(TARGET_LDFLAGS) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +POCO_LDFLAGS += -latomic +endif + 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) \ --unbundled \ From 5ac054b45ebf6669206c8bf2cb26f83cc229aa00 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 28 Aug 2022 12:13:21 +0200 Subject: [PATCH 109/140] package/poco: reflow multi-line assignments The rule is one-item per line in multi-line assignments, starting with the first item on its own line too? Signed-off-by: Yann E. MORIN --- package/poco/poco.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 3bcc42c455..bf18126a82 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -11,7 +11,9 @@ POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = pcre2 zlib \ +POCO_DEPENDENCIES = \ + pcre2 \ + zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ @@ -19,7 +21,9 @@ POCO_DEPENDENCIES = pcre2 zlib \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_POCO_XML),expat) -POCO_OMIT = Data/ODBC PageCompiler \ +POCO_OMIT = \ + Data/ODBC \ + PageCompiler \ $(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \ $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ From 7cb17577d42aad959a65702074061eeaf54447d7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Aug 2022 10:40:33 +0200 Subject: [PATCH 110/140] package/poco: add the new Prometheus component The Poco Prometheus component was added in 1.12.0. See: https://github.com/pocoproject/poco/blob/poco-1.12.0-release/CHANGELOG#L6 For Prometheus information, see: https://prometheus.io/ Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/poco/Config.in | 4 ++++ package/poco/poco.mk | 1 + 2 files changed, 5 insertions(+) diff --git a/package/poco/Config.in b/package/poco/Config.in index cb447960f1..820e631966 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -92,6 +92,10 @@ config BR2_PACKAGE_POCO_PDF select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_PROMETHEUS + bool "Prometheus" + select BR2_PACKAGE_POCO_NET + config BR2_PACKAGE_POCO_REDIS bool "Redis" select BR2_PACKAGE_POCO_NET diff --git a/package/poco/poco.mk b/package/poco/poco.mk index bf18126a82..d078faa8e5 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -37,6 +37,7 @@ POCO_OMIT = \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ + $(if $(BR2_PACKAGE_POCO_PROMETHEUS),,Prometheus) \ $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ $(if $(BR2_PACKAGE_POCO_XML),,XML) \ From 04d3aef6805aa2dbd5483ed4f9826b14c29faa50 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sun, 28 Aug 2022 18:53:03 +0300 Subject: [PATCH 111/140] package/mbedtls: add configurable DTLS-SRTP support Add a new option to have MbedTLS builds that support DTLS-SRTP. We can only enable the support, it's disabled by default. Signed-off-by: Dmitry Ilyin [yann.morin.1998@free.fr: - rename variable - fix variable name in .mk - drop unnecessary ref to AWS library ] Signed-off-by: Yann E. MORIN --- package/mbedtls/Config.in | 6 ++++++ package/mbedtls/mbedtls.mk | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/package/mbedtls/Config.in b/package/mbedtls/Config.in index a39ba65d98..abbe3356d8 100644 --- a/package/mbedtls/Config.in +++ b/package/mbedtls/Config.in @@ -29,4 +29,10 @@ config BR2_PACKAGE_MBEDTLS_COMPRESSION sure CRIME and similar attacks are not applicable to your particular situation. +config BR2_PACKAGE_MBEDTLS_DTLS_SRTP + bool "enable DTLS-SRTP support" + help + Enable support for negotiation of DTLS-SRTP (RFC 5764) + through the use_srtp extension. + endif diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index af87d62b30..1a888e8c67 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -72,4 +72,12 @@ else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) MBEDTLS_POST_CONFIGURE_HOOKS += MBEDTLS_DISABLE_ASM endif +ifeq ($(BR2_PACKAGE_MBEDTLS_DTLS_SRTP),y) +define MBEDTLS_ENABLE_DTLS_SRTP + $(SED) "s://#define MBEDTLS_SSL_DTLS_SRTP:#define MBEDTLS_SSL_DTLS_SRTP:" \ + $(@D)/include/mbedtls/config.h +endef +MBEDTLS_POST_PATCH_HOOKS += MBEDTLS_ENABLE_DTLS_SRTP +endif + $(eval $(cmake-package)) From 26ebde7013ee1b291918b05a67d5b5bfdb59af32 Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Fri, 26 Aug 2022 15:54:37 +0200 Subject: [PATCH 112/140] package/qt6/qt6base: add support for network module Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 9 +++++++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index a489ce39fc..68bca728e2 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -14,3 +14,12 @@ config BR2_PACKAGE_QT6BASE QtWidgets, etc. http://qt.io + +if BR2_PACKAGE_QT6BASE + +config BR2_PACKAGE_QT6BASE_NETWORK + bool "network module" + help + This options enables the Qt6Network library. + +endif diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c67d94e193..a93e98e035 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -75,5 +75,11 @@ define HOST_QT6BASE_INSTALL_CMDS $(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR) endef +ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) +QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From a39e0b95e1d927599e212098d1db4d2fafb2a35c Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Fri, 26 Aug 2022 15:54:38 +0200 Subject: [PATCH 113/140] package/qt6/qt6base: add support for concurrent module Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 68bca728e2..fe488f1cc9 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -17,6 +17,11 @@ config BR2_PACKAGE_QT6BASE if BR2_PACKAGE_QT6BASE +config BR2_PACKAGE_QT6BASE_CONCURRENT + bool "concurrent module" + help + This options enables the Qt6Concurrent library. + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index a93e98e035..35ab516795 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -81,5 +81,11 @@ else QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y) +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From d243ec33ad7fd815b38be8073e87215d6cb75f97 Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Fri, 26 Aug 2022 15:54:39 +0200 Subject: [PATCH 114/140] package/qt6/qt6base: add support for xml module Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index fe488f1cc9..41c04fc5f6 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -27,4 +27,9 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_XML + bool "XML module" + help + This options enables the Qt6Xml library. + endif diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 35ab516795..b2eff62eb1 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -87,5 +87,11 @@ else QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_XML),y) +QT6BASE_CONF_OPTS += -DFEATURE_xml=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From bb6352c9eddf51f13e033ea7bba846a1bdaf3cc6 Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Fri, 26 Aug 2022 15:54:40 +0200 Subject: [PATCH 115/140] package/qt6/qt6base: add support for test module Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 41c04fc5f6..354e02280a 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -27,6 +27,11 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_TEST + bool "test module" + help + This options enables the Qt6Test library. + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b2eff62eb1..db70386507 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -87,6 +87,12 @@ else QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TEST),y) +QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_XML),y) QT6BASE_CONF_OPTS += -DFEATURE_xml=ON else From 4337d4b8334e08e5baab03e6d9c64edc5afa802d Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Fri, 26 Aug 2022 15:54:41 +0200 Subject: [PATCH 116/140] package/qt6/qt6base: add support for dbus module Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 8 ++++++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 354e02280a..2d4a4df223 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -22,6 +22,14 @@ config BR2_PACKAGE_QT6BASE_CONCURRENT help This options enables the Qt6Concurrent library. +config BR2_PACKAGE_QT6BASE_DBUS + bool "DBus module" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + select BR2_PACKAGE_DBUS + help + This option enables the D-Bus module. + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index db70386507..36176367e5 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -75,6 +75,18 @@ define HOST_QT6BASE_INSTALL_CMDS $(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR) endef +# We need host-qt6base with D-Bus support, otherwise: "the tool +# "Qt6::qdbuscpp2xml" was not found in the Qt6DBusTools package." +ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y) +QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON -DINPUT_dbus=linked +QT6BASE_DEPENDENCIES += dbus +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON +HOST_QT6BASE_DEPENDENCIES += host-dbus +else +QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) QT6BASE_CONF_OPTS += -DFEATURE_network=ON else From c3c944e4214ad30f98e0dbc5e409b4c9e9aea71d Mon Sep 17 00:00:00 2001 From: Jesse Van Gavere Date: Fri, 26 Aug 2022 15:54:42 +0200 Subject: [PATCH 117/140] package/qt6/qt6base: add support for syslog backend Signed-off-by: Jesse Van Gavere Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 2d4a4df223..f3e56aefa4 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -35,6 +35,11 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_SYSLOG + bool "syslog support" + help + Logs to the standard UNIX logging mechanism. + config BR2_PACKAGE_QT6BASE_TEST bool "test module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 36176367e5..6603d08bf1 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -111,5 +111,11 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y) +QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From 62f1164cc9084a5e9b5ff99836db9279b0228ac9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 29 Aug 2022 08:25:33 +0200 Subject: [PATCH 118/140] package/libzip: bump to version 1.9.2 Update hash of license file (contact email address updated with https://github.com/nih-at/libzip/commit/401ef3dd977066bc8f9b9ae53ce60934501b47d0) https://libzip.org/news/release-1.9.2.html https://libzip.org/news/release-1.9.1.html https://libzip.org/news/release-1.9.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libzip/libzip.hash | 4 ++-- package/libzip/libzip.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index 5afdfd7cb8..26c038e4b6 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz -sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE +sha256 c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 libzip-1.9.2.tar.xz +sha256 01c022eca6d566e2e8792fd0f091a28653b2a608319922bcd4de91c49d1438e1 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 6bc5c5c193..0c9d66d877 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.8.0 +LIBZIP_VERSION = 1.9.2 LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause From 9b5caa2ab45d7ec01e1657b10f94c2f60c7afe8e Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Mon, 29 Aug 2022 11:30:49 +0100 Subject: [PATCH 119/140] package/libiio: bump to version v0.24 The changelog is available here: https://github.com/analogdevicesinc/libiio/releases/tag/v0.24 Remove the 0001 patch as it is included in the v0.24 version. Signed-off-by: Paul Cercueil Signed-off-by: Thomas Petazzoni --- ...rs-setters-cannot-be-marked-readonly.patch | 32 ------------------- package/libiio/libiio.hash | 2 +- package/libiio/libiio.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/libiio/0001-C-public-fields-with-getters-setters-cannot-be-marked-readonly.patch diff --git a/package/libiio/0001-C-public-fields-with-getters-setters-cannot-be-marked-readonly.patch b/package/libiio/0001-C-public-fields-with-getters-setters-cannot-be-marked-readonly.patch deleted file mode 100644 index a665d48363..0000000000 --- a/package/libiio/0001-C-public-fields-with-getters-setters-cannot-be-marked-readonly.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 85bf9cd32138539252ed01c355cf766612cf47c9 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Thu, 2 Sep 2021 11:04:21 +0100 -Subject: [PATCH] C#: public fields with getters/setters cannot be marked - readonly - -MSVC would fail with the following error: -error CS0106: The modifier 'readonly' is not valid for this item - -Reported-by: Raluca Chis -Signed-off-by: Paul Cercueil - -[Retrieved from: -https://github.com/analogdevicesinc/libiio/commit/85bf9cd32138539252ed01c355cf766612cf47c9] -Signed-off-by: Fabrice Fontaine ---- - bindings/csharp/Device.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bindings/csharp/Device.cs b/bindings/csharp/Device.cs -index 96214243f..6c8c8f4f3 100644 ---- a/bindings/csharp/Device.cs -+++ b/bindings/csharp/Device.cs -@@ -208,7 +208,7 @@ public override void write(string str) - public readonly string name; - - /// The label of this device. -- public readonly string label { get; private set; } -+ public string label { get; private set; } - - /// A list of all the attributes that this device has. - public readonly List attrs; diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index c523b5d685..f497756eac 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 df1577740ea93dca732e7d7c04786600cb083117901dee793f3d38980754af00 libiio-0.23.tar.gz +sha256 a2b5d848531ea64fd9f95327dfd5a588bd227d9577281ec375e822702c6a52d5 libiio-0.24.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index cfae34b2b7..9e2cf454b5 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.23 +LIBIIO_VERSION = 0.24 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+ From 6c24f7cb8da5651bdfbcb40da5c762e1e85a93fc Mon Sep 17 00:00:00 2001 From: Sven Oliver Moll Date: Mon, 29 Aug 2022 17:14:22 +0200 Subject: [PATCH 120/140] package/most: bump version to 5.2.0 The COPYRIGHT file hash has changed due to: - Copyright (c) 1991, 1999, 2002, 2005-2018,2019 John E. Davis + Copyright (c) 1991, 1999, 2002, 2005-2021, 2022 John E. Davis Signed-off-by: Sven Oliver Moll Signed-off-by: Thomas Petazzoni --- package/most/most.hash | 6 +++--- package/most/most.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/most/most.hash b/package/most/most.hash index db0eb6db59..ec9da9adcd 100644 --- a/package/most/most.hash +++ b/package/most/most.hash @@ -1,6 +1,6 @@ # From https://www.jedsoft.org/releases/most/ -sha1 db811669a6b22c15478c957b439b5e4483ce1c95 most-5.1.0.tar.gz +sha1 322073ee6e8c45ce084f4fccd08d3f026aa1f66d most-5.2.0.tar.gz # Locally computed -sha256 db805d1ffad3e85890802061ac8c90e3c89e25afb184a794e03715a3ed190501 most-5.1.0.tar.gz +sha256 9455aeb8f826fa8385c850dc22bf0f22cf9069b3c3423fba4bf2c6f6226d9903 most-5.2.0.tar.gz sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING -sha256 47ad1c3f9b94d6ec42d9bee6c5df980c5c2daa5b9d22113545ae6a3f21ca2f52 COPYRIGHT +sha256 3d8f860532c9f202db9300375fb29a1e7b32f538c6033e7013266ad55317fc3e COPYRIGHT diff --git a/package/most/most.mk b/package/most/most.mk index 28d82cddf1..24627c046a 100644 --- a/package/most/most.mk +++ b/package/most/most.mk @@ -5,7 +5,7 @@ ################################################################################ MOST_SITE = http://www.jedsoft.org/releases/most -MOST_VERSION = 5.1.0 +MOST_VERSION = 5.2.0 MOST_LICENSE = GPL-2.0+ MOST_LICENSE_FILES = COPYING COPYRIGHT MOST_DEPENDENCIES = slang From 4b4b19a9a0384713933b29a03138b4ce32dbfb60 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Tue, 30 Aug 2022 10:04:40 +0200 Subject: [PATCH 121/140] package/fmt: bump to version 9.1.0 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- 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 c203e35867..65eeaa4ebe 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fc96dd2d2fdf2bded630787adba892c23cb9e35c6fd3273c136b0c57d4651ad6 fmt-9.0.0.zip +sha256 cceb4cb9366e18a5742128cb3524ce5f50e88b476f1e54737a47ffdf4df4c996 fmt-9.1.0.zip sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index b7d67a0f28..ed0703cbc9 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 9.0.0 +FMT_VERSION = 9.1.0 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 4fbce4ea35a0c86313f11200f9496878f8a45d73 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Aug 2022 22:42:33 +0200 Subject: [PATCH 122/140] arch/Config.in.powerpc: VSX implies altivec As spotted by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20220823212219.5066-1-fontaine.fabrice@gmail.com, VSX is an extension to AltiVec: https://en.wikipedia.org/wiki/AltiVec#VSX_(Vector_Scalar_Extension) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- arch/Config.in.powerpc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index c48edd3bb4..9fa0be0d73 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -3,6 +3,7 @@ config BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_POWERPC_CPU_HAS_VSX bool + select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_POWERPC_CPU_HAS_SPE bool @@ -135,11 +136,9 @@ config BR2_powerpc_power6 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power7 bool "power7" - select BR2_POWERPC_CPU_HAS_ALTIVEC select BR2_POWERPC_CPU_HAS_VSX config BR2_powerpc_power8 bool "power8" - select BR2_POWERPC_CPU_HAS_ALTIVEC select BR2_POWERPC_CPU_HAS_VSX endchoice From fc7ba3ab8fa6c3144098fae057c758d35279e46f Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 29 Aug 2022 19:14:13 +0200 Subject: [PATCH 123/140] package/python-paho-mqtt: bump to 1.6.1 We need to switch to the github download as the sdist published to pypi doesn't package the epl-v20 license file isn't included there: https://github.com/eclipse/paho.mqtt.python/pull/635 License changed to EPL-2.0 and EDLv1.0. Changelog: https://github.com/eclipse/paho.mqtt.python/blob/master/ChangeLog.txt Signed-off-by: Marcus Hoffmann [yann.morin.1998@free.fr: - use spaces in hash file - drop localy computed md5 - license is EPL *and* EDL, not _or_ ] Signed-off-by: Yann E. MORIN --- package/python-paho-mqtt/python-paho-mqtt.hash | 9 ++++----- package/python-paho-mqtt/python-paho-mqtt.mk | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index bf3993e919..81b9dda81d 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,6 +1,5 @@ -# md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed -md5 e3ac29cd5dc247a01083a2a8f3fddd08 paho-mqtt-1.4.0.tar.gz -sha256 e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79 paho-mqtt-1.4.0.tar.gz -sha256 76f13729e84e9222e543303df00f87d1b2c0995b6a505cd859a285667e44babb LICENSE.txt +# locally computed +sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz +sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-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 d192749e1e..f255a7847d 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.4.0 -PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz -PYTHON_PAHO_MQTT_SITE = https://files.pythonhosted.org/packages/25/63/db25e62979c2a716a74950c9ed658dce431b5cb01fde29eb6cba9489a904 -PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0 -PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 +PYTHON_PAHO_MQTT_VERSION = 1.6.1 +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 $(eval $(python-package)) From 5a8c013bb0f0d1be9eb8f1c169f9ee69a6389635 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 3 Sep 2022 15:58:40 +0200 Subject: [PATCH 124/140] package/lua-lunix: bump to version 20220331 remove merged patches Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-lunix/0001-fix-with-uClibc.patch | 28 ------------------- ...atch => 0001-remove-link-with-librt.patch} | 8 +++--- .../lua-lunix/0003-fix-sysctl-detection.patch | 24 ---------------- package/lua-lunix/lua-lunix.hash | 4 +-- package/lua-lunix/lua-lunix.mk | 2 +- 5 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 package/lua-lunix/0001-fix-with-uClibc.patch rename package/lua-lunix/{0002-remove-link-with-librt.patch => 0001-remove-link-with-librt.patch} (70%) delete mode 100644 package/lua-lunix/0003-fix-sysctl-detection.patch diff --git a/package/lua-lunix/0001-fix-with-uClibc.patch b/package/lua-lunix/0001-fix-with-uClibc.patch deleted file mode 100644 index 236eec47a1..0000000000 --- a/package/lua-lunix/0001-fix-with-uClibc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ee41d97a80b978f54941ac6857c00b8a8f28de24 Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sun, 6 Jun 2021 17:55:06 +0200 -Subject: [PATCH] fix with uClibc - -uClibc doesn't have is no sys_siglist. - -Signed-off-by: Francois Perrad ---- - lunix-rel-20170920/src/unix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c -index 5f3a70a..e561ab2 100644 ---- a/lunix-rel-20170920/src/unix.c -+++ b/lunix-rel-20170920/src/unix.c -@@ -438,7 +438,7 @@ - #endif - - #ifndef HAVE_SYS_SIGLIST --#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX) -+#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX && !__UCLIBC__) - #endif - - #ifndef HAVE_UNLINKAT --- -2.30.2 - diff --git a/package/lua-lunix/0002-remove-link-with-librt.patch b/package/lua-lunix/0001-remove-link-with-librt.patch similarity index 70% rename from package/lua-lunix/0002-remove-link-with-librt.patch rename to package/lua-lunix/0001-remove-link-with-librt.patch index 7b1c8ddd57..2650e9117c 100644 --- a/package/lua-lunix/0002-remove-link-with-librt.patch +++ b/package/lua-lunix/0001-remove-link-with-librt.patch @@ -7,13 +7,13 @@ librt is not available with musl Signed-off-by: Francois Perrad --- - lunix-rel-20170920/lunix-20170920-1.rockspec | 10 ---------- + lunix-rel-20220331/lunix-20220331-1.rockspec | 10 ---------- 1 file changed, 10 deletions(-) -diff --git a/lunix-rel-20170920/lunix-20170920-1.rockspec b/lunix-rel-20170920/lunix-20170920-1.rockspec +diff --git a/lunix-rel-20220331/lunix-20220331-1.rockspec b/lunix-rel-20220331/lunix-20220331-1.rockspec index 741179d..76cafeb 100644 ---- a/lunix-rel-20170920/lunix-20170920-1.rockspec -+++ b/lunix-rel-20170920/lunix-20170920-1.rockspec +--- a/lunix-rel-20220331/lunix-20220331-1.rockspec ++++ b/lunix-rel-20220331/lunix-20220331-1.rockspec @@ -26,16 +26,6 @@ build = { }; }; diff --git a/package/lua-lunix/0003-fix-sysctl-detection.patch b/package/lua-lunix/0003-fix-sysctl-detection.patch deleted file mode 100644 index 18656b1921..0000000000 --- a/package/lua-lunix/0003-fix-sysctl-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -sys/sysctl.h was removed with glibc 2.32 - -Fetched from: https://github.com/wahern/lunix/pull/20/files -Signed-off-by: Francois Perrad ---- - lunix-rel-20170920/src/unix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c -index 272820a..fa00876 100644 ---- a/lunix-rel-20170920/src/unix.c -+++ b/lunix-rel-20170920/src/unix.c -@@ -165,7 +165,7 @@ - #endif - - #ifndef HAVE_SYS_SYSCTL_H /* missing on musl libc */ --#define HAVE_SYS_SYSCTL_H (defined BSD || GLIBC_PREREQ(0,0) || UCLIBC_PREREQ(0,0,0)) -+#define HAVE_SYS_SYSCTL_H (defined BSD || (__GLIBC__ && !GLIBC_PREREQ(2,32)) || UCLIBC_PREREQ(0,0,0)) - #endif - - #ifndef HAVE_STRUCT_IN_PKTINFO --- -2.30.2 - diff --git a/package/lua-lunix/lua-lunix.hash b/package/lua-lunix/lua-lunix.hash index 6e3c920db4..911f475b0e 100644 --- a/package/lua-lunix/lua-lunix.hash +++ b/package/lua-lunix/lua-lunix.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4a4007b394ae884e18e9d0319ea584e8b4a682d7bf8fa5b99c7eea9baf1e5ed6 lunix-20170920-1.src.rock -sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20170920/LICENSE +sha256 eb13e89e1dfcc82aec3915ed4185f3a2a9205ec3e98a991b13cc39d7f389c427 lunix-20220331-1.src.rock +sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20220331/LICENSE diff --git a/package/lua-lunix/lua-lunix.mk b/package/lua-lunix/lua-lunix.mk index 28cb2dc411..f3c159cbf4 100644 --- a/package/lua-lunix/lua-lunix.mk +++ b/package/lua-lunix/lua-lunix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LUNIX_VERSION_UPSTREAM = 20170920 +LUA_LUNIX_VERSION_UPSTREAM = 20220331 LUA_LUNIX_VERSION = $(LUA_LUNIX_VERSION_UPSTREAM)-1 LUA_LUNIX_NAME_UPSTREAM = lunix LUA_LUNIX_SUBDIR = lunix-rel-$(LUA_LUNIX_VERSION_UPSTREAM) From 2beb090ec81862da500dff31804f4d2436b388d3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 3 Sep 2022 15:58:51 +0200 Subject: [PATCH 125/140] package/luasec: bump to version 1.2.0 Change in license hash is due to version bump and copyright year udpate. Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1e381612bd..3c2b7d803b 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock -sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE +sha256 82d9ea7d11688a2b11fc1c4549a2e7b0aca00790b49e67a41dac0c81f2890f1c luasec-1.2.0-1.src.rock +sha256 bbf73e23eae7df57a4c4ff33bc23c41a2dc4f8707ba33235c2026d20b41405a7 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 4ace94d168..c7f3a94d9a 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0.2-1 +LUASEC_VERSION = 1.2.0-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From 36d00aee880a1276ec3bf3f47ee24b81f555e5dc Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Mon, 5 Sep 2022 10:55:33 -0300 Subject: [PATCH 126/140] package/stella: bump to version 6.7 - drop a patch (already in version) - update Copyright.txt (changed from 1995-2021 to 1995-2022) Signed-off-by: Sergio Prado Signed-off-by: Yann E. MORIN --- package/stella/0001-configure-add-CC.patch | 30 ---------------------- package/stella/stella.hash | 4 +-- package/stella/stella.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/stella/0001-configure-add-CC.patch diff --git a/package/stella/0001-configure-add-CC.patch b/package/stella/0001-configure-add-CC.patch deleted file mode 100644 index d4b29e39b5..0000000000 --- a/package/stella/0001-configure-add-CC.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 143cf9fa13a07b827de7065a5e919631406b0941 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Dec 2021 22:46:52 +0100 -Subject: [PATCH] configure: add CC (#854) - -Add CC to fix the following build failure when cross-compiling which is -raised since -https://github.com/stella-emu/stella/commit/771b5b44e31de1b81a552ee47b65014fbc338776: - -out/src/sqlite/sqlite3.o: file not recognized: file format not recognized - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/stella-emu/stella/commit/143cf9fa13a07b827de7065a5e919631406b0941] ---- - configure | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure b/configure -index df666b377..0101d2567 100755 ---- a/configure -+++ b/configure -@@ -899,6 +899,7 @@ echo "Creating config.mak" - cat > config.mak << EOF - # -------- Generated by configure ----------- - -+CC := $CC - CXX := $CXX - CXXFLAGS := $CXXFLAGS - LD := $LD diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 8aa5118165..17d059226c 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d481efc6d27b5294565dfcc10983de2dbc4db8a59932a678ffdb4d2404b8c207 stella-6.6-src.tar.xz -sha256 d5e5897578c2590e48328986cebd950ff215653f7f506ef93accf981870366a6 Copyright.txt +sha256 babfcbb39abbd1a992cb1e6d3b2f508df7ed19cb9d0b5b5d624828bb98f97267 stella-6.7-src.tar.xz +sha256 e82dd017fea2c70a16726aa1d7c05c5b7597e10f7229511c1b110bf84cb507c0 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index 198a1134dc..aa5da1996e 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.6 +STELLA_VERSION = 6.7 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ From 1ea9c7d7816d5c49e60e5900609cc20d74b65309 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Sep 2022 22:32:35 +0200 Subject: [PATCH 127/140] package/yaml-cpp: bump to version 0.7.0 Handling YAML_BUILD_SHARED_LIBS is not needed since https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c https://github.com/jbeder/yaml-cpp/releases/tag/yaml-cpp-0.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/yaml-cpp/yaml-cpp.hash | 2 +- package/yaml-cpp/yaml-cpp.mk | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/yaml-cpp/yaml-cpp.hash b/package/yaml-cpp/yaml-cpp.hash index 2f7a6fc639..9ad9041439 100644 --- a/package/yaml-cpp/yaml-cpp.hash +++ b/package/yaml-cpp/yaml-cpp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed yaml-cpp-0.6.3.tar.gz +sha256 43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3 yaml-cpp-0.7.0.tar.gz sha256 aa6fcc27be034e41e21dd832f9175bfe694a48491d9e14ff0fa278e19ad14f1b LICENSE diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index 895072ec45..d65298ffb9 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -YAML_CPP_VERSION = 0.6.3 +YAML_CPP_VERSION = 0.7.0 YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT @@ -16,10 +16,4 @@ YAML_CPP_CONF_OPTS += \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF -ifeq ($(BR2_STATIC_LIBS),y) -YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=OFF -else -YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=ON -endif - $(eval $(cmake-package)) From c33628124313f63237758408f7f891f35953acc1 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 4 Sep 2022 12:10:10 -0700 Subject: [PATCH 128/140] package/docker-compose: bump to version 2.10.0 Docker Compose v2 is no longer a standalone component, but is now a plugin loaded by docker-cli. As such, it should not be installed in /usr/bin, but in the directory where docker-cli loads its plugins from. Additionally, we consequently make docker-compose depend on docker-cli; indeed, it does not really make sense to present a plugin unless the component it attaches to is already enabled [0]. License hash changed due to strictly copying the license text template, without customisation to the year and copyright owner. [0] the original submission by Christian would use a select, to keep existing config, but that's not sensible, as we already have some packages that are plugins and that use depends-on, like nginx plugins. For consistency and as it semantically makes sense, we use a depends-on here too. Signed-off-by: Christian Stewart [yann.morin.1998@free.fr: - don't select docker-cli, but depends-on it; explain it in commit log - explain why we override the install commands - explain change in license file hash ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + ...p-generic-versions-and-bump-requests.patch | 66 ------------------- ...2-Bump-texttable-from-0.9.1-to-1.6.2.patch | 41 ------------ ...003-support-PyYAML-up-to-5.1-version.patch | 44 ------------- package/docker-compose/Config.in | 35 +++------- package/docker-compose/docker-compose.hash | 8 +-- package/docker-compose/docker-compose.mk | 17 +++-- 7 files changed, 27 insertions(+), 185 deletions(-) delete mode 100644 package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch delete mode 100644 package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch delete mode 100644 package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch diff --git a/DEVELOPERS b/DEVELOPERS index 54e1c1fe7b..a707b0e5e1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -534,6 +534,7 @@ F: package/batman-adv/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ +F: package/docker-compose/ F: package/docker-engine/ F: package/docker-proxy/ F: package/embiggen-disk/ diff --git a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch b/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch deleted file mode 100644 index 536a9590dd..0000000000 --- a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001 -From: Ulysses Souza -Date: Tue, 2 Jul 2019 15:49:07 +0200 -Subject: [PATCH] Strip up generic versions and bump requests - -Replaces generic limitations with a next major value -Bump the minimal `requests` to 2.20.0 - -Signed-off-by: Ulysses Souza -(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6) -Signed-off-by: Peter Korsgaard ---- - setup.py | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/setup.py b/setup.py -index 8371cc75..61447801 100644 ---- a/setup.py -+++ b/setup.py -@@ -31,31 +31,31 @@ def find_version(*file_paths): - - install_requires = [ - 'cached-property >= 1.2.0, < 2', -- 'docopt >= 0.6.1, < 0.7', -- 'PyYAML >= 3.10, < 4.3', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', -- 'texttable >= 0.9.0, < 0.10', -- 'websocket-client >= 0.32.0, < 1.0', -- 'docker[ssh] >= 3.7.0, < 4.0', -- 'dockerpty >= 0.4.1, < 0.5', -+ 'docopt >= 0.6.1, < 1', -+ 'PyYAML >= 3.10, < 5', -+ 'requests >= 2.20.0, < 3', -+ 'texttable >= 0.9.0, < 1', -+ 'websocket-client >= 0.32.0, < 1', -+ 'docker[ssh] >= 3.7.0, < 5', -+ 'dockerpty >= 0.4.1, < 1', - 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 3', - ] - - - tests_require = [ -- 'pytest', -+ 'pytest < 6', - ] - - - if sys.version_info[:2] < (3, 4): -- tests_require.append('mock >= 1.0.1') -+ tests_require.append('mock >= 1.0.1, < 2') - - extras_require = { - ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], -- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], -- ':python_version < "3.3"': ['ipaddress >= 1.0.16'], -- ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'], -+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], -+ ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'], -+ ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], - 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], - } - --- -2.20.1 - diff --git a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch b/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch deleted file mode 100644 index 92c2e1f133..0000000000 --- a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e55dd65ba42a17ba4b017b42f14f7ee647efe64f Mon Sep 17 00:00:00 2001 -From: Ulysses Souza -Date: Mon, 8 Jul 2019 14:52:30 +0200 -Subject: [PATCH] Bump texttable from 0.9.1 to 1.6.2 - -Signed-off-by: Ulysses Souza -(cherry picked from commit 0bfa1c34f054d86674434770d4d6340e02508e52) -Signed-off-by: Peter Korsgaard ---- - requirements.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 6007ee3f..d868fdeb 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -19,6 +19,6 @@ PySocks==1.6.7 - PyYAML==4.2b1 - requests==2.20.0 - six==1.10.0 --texttable==0.9.1 -+texttable==1.6.2 - urllib3==1.21.1; python_version == '3.3' - websocket-client==0.56.0 -diff --git a/setup.py b/setup.py -index 61447801..c9e4729d 100644 ---- a/setup.py -+++ b/setup.py -@@ -34,7 +34,7 @@ install_requires = [ - 'docopt >= 0.6.1, < 1', - 'PyYAML >= 3.10, < 5', - 'requests >= 2.20.0, < 3', -- 'texttable >= 0.9.0, < 1', -+ 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', - 'docker[ssh] >= 3.7.0, < 5', - 'dockerpty >= 0.4.1, < 1', --- -2.20.1 - diff --git a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch deleted file mode 100644 index ecbd197a51..0000000000 --- a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001 -From: Sergey Fursov -Date: Sun, 31 Mar 2019 12:45:50 +0700 -Subject: [PATCH] support PyYAML up to 5.1 version - -Signed-off-by: Sergey Fursov -[Upstream: https://github.com/docker/compose/pull/6623] -(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d) -[Peter: allow all 5.x] -Signed-off-by: Peter Korsgaard ---- - requirements.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index d868fdeb..e3dbc807 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -16,7 +16,7 @@ paramiko==2.4.2 - pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' - pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6' - PySocks==1.6.7 --PyYAML==4.2b1 -+PyYAML==5.1 - requests==2.20.0 - six==1.10.0 - texttable==1.6.2 -diff --git a/setup.py b/setup.py -index c9e4729d..17ab678e 100644 ---- a/setup.py -+++ b/setup.py -@@ -32,7 +32,7 @@ def find_version(*file_paths): - install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 1', -- 'PyYAML >= 3.10, < 5', -+ 'PyYAML >= 3.10, < 6', - 'requests >= 2.20.0, < 3', - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', --- -2.20.1 - diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index f82a0c4bc2..59128f7a19 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,30 +1,15 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" - depends on BR2_USE_MMU # python3 - depends on BR2_USE_WCHAR # python3 - depends on BR2_TOOLCHAIN_HAS_THREADS # python3 - depends on !BR2_STATIC_LIBS # python3 - # python-paramiko -> python-cryptography - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime - select BR2_PACKAGE_PYTHON_DOCOPT # runtime - select BR2_PACKAGE_PYTHON_PARAMIKO # runtime - select BR2_PACKAGE_PYTHON_PYYAML # runtime - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_TEXTTABLE # runtime - select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime - select BR2_PACKAGE_PYTHON_DOCKER # runtime - select BR2_PACKAGE_PYTHON_DOCKERPTY # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime + 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 + depends on BR2_PACKAGE_DOCKER_CLI help - Multi-container orchestration for Docker. + Multi-container applications with the Docker CLI. - https://www.docker.com/ + https://github.com/docker/compose -comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS +comment "docker-compose needs docker-cli and 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 || !BR2_PACKAGE_DOCKER_CLI diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 42d71c8095..46a8c59d55 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,5 +1,3 @@ -# from https://pypi.python.org/pypi/docker-compose/json -sha256 a5d58e974fd717e24b0dda6669a46bc03548d9023ef38d965acdc32d4d5fa753 docker-compose-1.24.1.tar.gz - -# locally computed -sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE +# Locally computed +sha256 7f051283dc2c047a40604c52dffa579a079bdf54eca742da54f8352dcffc3549 docker-compose-2.10.0.tar.gz +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ec24157c56..1d071cc423 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,10 +4,19 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 1.24.1 -DOCKER_COMPOSE_SITE = https://files.pythonhosted.org/packages/b6/a4/59c39df6a23144a6252ad33170dfbf781af5953651e4587e8ea5f995f95e -DOCKER_COMPOSE_SETUP_TYPE = setuptools +DOCKER_COMPOSE_VERSION = 2.10.0 +DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE -$(eval $(python-package)) +DOCKER_COMPOSE_BUILD_TARGETS = cmd +DOCKER_COMPOSE_GOMOD = github.com/docker/compose/v2 +DOCKER_COMPOSE_LDFLAGS = \ + -X github.com/docker/compose/v2/internal.Version=$(DOCKER_COMPOSE_VERSION) + +define DOCKER_COMPOSE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/bin/cmd \ + $(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-compose +endef + +$(eval $(golang-package)) From 20285161549eb695c678e02b5c173fccdce59896 Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Sun, 4 Sep 2022 14:12:17 -0300 Subject: [PATCH 129/140] package/tio: bump to version 1.47 Signed-off-by: Sergio Prado Signed-off-by: Yann E. MORIN --- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tio/tio.hash b/package/tio/tio.hash index 5058ccca8e..cb0311a752 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v1.40/tio-1.40.tar.xz.sha256sum: -sha256 beafc4763552ff7cf3a368e8af36258018ef85fac32133c4635051d7615ab527 tio-1.40.tar.xz +# From https://github.com/tio/tio/releases/download/v1.47/tio-1.47.tar.xz.sha256sum: +sha256 6f39ac582de747feb9a64c14e6b378c61cb0c3bfa6639e62050022c1b7f5c544 tio-1.47.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 5c469667f6..0035ce445e 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIO_VERSION = 1.40 +TIO_VERSION = 1.47 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ From 4ebc9d0b85deb742a9df727a32ab2fc8b0989d30 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Sep 2022 16:42:33 +0200 Subject: [PATCH 130/140] configs: remove uClibc config options Following the switch to Glibc as the default libc in Buildroot [1], all defconfigs expecting uClibc with wchar (or any other uClibc specific option) should now select BR2_TOOLCHAIN_BUILDROOT_UCLIBC too. Even if all defconfigs has been tested with uClibc, maintainers prefer to not enforce a C library and use the default of Buildroot, which is now glibc. This commit remove uClibc specific options BR2_TOOLCHAIN_BUILDROOT_WCHAR, BR2_PTHREAD_DEBUG (required by gdb) and BR2_TOOLCHAIN_BUILDROOT_USE_SSP. Since glibc always has argp built-in, also remove the standalone one from affected toolchains... Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/2911738579 [1] 4057e36ca9665edd5248512e4edba2c243b8f4be [2] http://lists.busybox.net/pipermail/buildroot/2022-August/649998.html Signed-off-by: Romain Naour [yann.morin.1998@free.fr: also drop argp-standalone] Signed-off-by: Yann E. MORIN --- configs/aarch64_efi_defconfig | 3 --- configs/at91sam9x5ek_dev_defconfig | 4 ---- configs/at91sam9x5ek_mmc_dev_defconfig | 4 ---- configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 2 -- configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 4 ---- configs/atmel_sama5d3_xplained_dev_defconfig | 4 ---- configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 4 ---- configs/atmel_sama5d4_xplained_dev_defconfig | 4 ---- configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 4 ---- configs/bananapro_defconfig | 3 --- configs/engicam_imx6qdl_icore_qt5_defconfig | 1 - configs/galileo_defconfig | 2 -- configs/imx6-sabresd_qt5_defconfig | 1 - configs/kontron_smarc_sal28_defconfig | 1 - configs/lego_ev3_defconfig | 3 --- configs/mender_x86_64_efi_defconfig | 4 ---- configs/microchip_sam9x60ek_mmc_dev_defconfig | 3 --- configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 3 --- configs/microchip_sama5d2_icp_mmc_dev_defconfig | 3 --- configs/microchip_sama7g5ek_mmc_dev_defconfig | 3 --- configs/minnowboard_max_defconfig | 2 -- configs/pc_x86_64_bios_defconfig | 3 --- configs/pc_x86_64_efi_defconfig | 3 --- configs/qemu_aarch64_sbsa_defconfig | 3 --- 24 files changed, 71 deletions(-) diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 1bd06c51f3..443113e47b 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -1,9 +1,6 @@ # Architecture BR2_aarch64=y -# Toolchain, required for eudev and grub -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index 8714463d89..824aa8b1f7 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -5,10 +5,6 @@ BR2_arm926t=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 9481594716..3b2016b970 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -5,10 +5,6 @@ BR2_arm926t=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 38618a5732..85ff29771a 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 1654408aa5..4ee7fca35f 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index 64455cb2e0..ef09df3fce 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -7,10 +7,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index 8f5724d631..f5aa3e382f 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -7,10 +7,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index fab91cf0b3..ca51ef5b5f 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index f9074e9862..e8d126c7b0 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig index e18c83d593..dbebdf3e37 100644 --- a/configs/bananapro_defconfig +++ b/configs/bananapro_defconfig @@ -8,9 +8,6 @@ BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System configuration BR2_TARGET_GENERIC_HOSTNAME="bananapro" BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pro!" diff --git a/configs/engicam_imx6qdl_icore_qt5_defconfig b/configs/engicam_imx6qdl_icore_qt5_defconfig index 2d213e4ab9..6d3a344bdd 100644 --- a/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -47,7 +47,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay" # qt5 dependencies -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # qt5 diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 312162b7a8..29110677bb 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,7 +1,5 @@ BR2_x86_x1000=y BR2_GLOBAL_PATCH_DIR="board/intel/galileo/patches" -# Needed for TARGET_GRUB2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Linux headers same as kernel, a 3.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index d962ac6897..e385e86b81 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -8,7 +8,6 @@ BR2_ARM_FPU_VFPV3=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # System diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index 37e415cf32..877903a1fe 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,7 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/smarc-sal28/post-build.sh" diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index 555a63e36c..1ce2817d42 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -2,9 +2,6 @@ BR2_arm=y BR2_arm926t=y -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" diff --git a/configs/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig index 4ab4c7b03d..6919a60c90 100644 --- a/configs/mender_x86_64_efi_defconfig +++ b/configs/mender_x86_64_efi_defconfig @@ -3,10 +3,6 @@ BR2_x86_64=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y -# Required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Required for sysvinit -BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 2b4e234297..4c842f2bb0 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -1,7 +1,5 @@ BR2_arm=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -47,7 +45,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index f9aa6cdc05..5f6eba482c 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -50,7 +48,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index b1b22c1312..64df7b4d13 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -42,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index d68846e553..2fca9873a6 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -2,8 +2,6 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -42,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig index 1270f23953..83a970f601 100644 --- a/configs/minnowboard_max_defconfig +++ b/configs/minnowboard_max_defconfig @@ -10,8 +10,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for grub2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index df5988d75e..ec34a41667 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -1,9 +1,6 @@ # Architecture BR2_x86_64=y -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 18d2c477d5..da05471e28 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -1,9 +1,6 @@ # Architecture BR2_x86_64=y -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 0d4e8b2c29..609444e787 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -2,9 +2,6 @@ BR2_aarch64=y BR2_cortex_a57=y -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" From 0418810e7eb23875ccd2c9ba1bbc32e0ba90d45c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 29 Aug 2022 21:58:31 +0200 Subject: [PATCH 131/140] package/python-gnupg: bump to version 0.5.0 For change log, see: https://github.com/vsajip/python-gnupg/releases/tag/0.5.0 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-gnupg/python-gnupg.hash | 4 ++-- package/python-gnupg/python-gnupg.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash index f7267308f6..7886ff7dae 100644 --- a/package/python-gnupg/python-gnupg.hash +++ b/package/python-gnupg/python-gnupg.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-gnupg/json -md5 e27cd8c6ce3b5c9197e931b65bbb4c9a python-gnupg-0.4.9.tar.gz -sha256 aaa748795572591aaf127b4ac8985684f3673ff82b39f370c836b006e68fc537 python-gnupg-0.4.9.tar.gz +md5 19cc1aef3a612b7b5f13e388260e65d4 python-gnupg-0.5.0.tar.gz +sha256 70758e387fc0e0c4badbcb394f61acbe68b34970a8fed7e0f7c89469fe17912a python-gnupg-0.5.0.tar.gz # Locally computed sha256 checksums sha256 4104ca980dbca7603fc553078378eb14566a76f819d033d7bff89fd6a97e181b LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index 582a649f9a..b51ac61892 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_GNUPG_VERSION = 0.4.9 -PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/c8/cb/46fb80639cf0dd4251aeb075a1a5e2ebbb8c9656f28ddfe9d8c99b68b6da +PYTHON_GNUPG_VERSION = 0.5.0 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/e3/5c/5ff9877001616912a74f4377cd5f80925b31a678087800beae5b28bdb80e PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt PYTHON_GNUPG_CPE_ID_VENDOR = python From 02e7e6977df290ff6e5ad724024aefb9d571e297 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 1 Sep 2022 12:58:19 +0200 Subject: [PATCH 132/140] package/luaexpat: bump to version 1.5.0 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/luaexpat/luaexpat.hash | 2 +- package/luaexpat/luaexpat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index fbfb623fcc..be67e9be6f 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 bee88ddc1063f49c5685b75b6696e8df0607a388432cbcb189cd0b8291d956aa luaexpat-1.4.0-1.src.rock +sha256 536a5eda09bb070d2de8ecdd15566d3a55e2afa5ded2ef183cd453bac8c41e98 luaexpat-1.5.0-1.src.rock sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index c176fb8c17..f56bf604b3 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.4.0-1 +LUAEXPAT_VERSION = 1.5.0-1 LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE From 7637a8ac8830fd22ae89b236b4946f1b8ce03e75 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 1 Sep 2022 12:58:31 +0200 Subject: [PATCH 133/140] package/luasocket: bump to version 3.1.0 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/luasocket/luasocket.hash | 2 +- package/luasocket/luasocket.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash index b66ae57b9b..bfbc06f3ee 100644 --- a/package/luasocket/luasocket.hash +++ b/package/luasocket/luasocket.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock +sha256 f4a207f50a3f99ad65def8e29c54ac9aac668b216476f7fae3fae92413398ed2 luasocket-3.1.0-1.src.rock sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index eeece26fd5..be360a3371 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASOCKET_VERSION = 3.0.0-1 +LUASOCKET_VERSION = 3.1.0-1 LUASOCKET_SUBDIR = luasocket LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE From f89f8aa1554bf04282112b789a209b85a2e9133a Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 1 Sep 2022 14:02:59 +0200 Subject: [PATCH 134/140] package/networkd-dispatcher: bump to version 2.2.3 lots of fixes but most importantly: - don't allow unknown operational/admin states (CVE-2022-29799, CVE-2022-29800) Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ca7c300783..ffb4fa846a 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 4f609db73a..2b1aa257ce 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_VERSION = 2.2.3 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 From ec1b5c59a183ecbaf5774856b8b3228363993fef Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Thu, 1 Sep 2022 17:56:05 +0200 Subject: [PATCH 135/140] package/openlayers: bump to version 7.1.0 OpenLayers changed its release format again, only two weeks after the previous change. The good news is, though, that they now ship a single release archive that includes the compiled JavaScript code together with the source code. Furthermore, they ship both code with a single license, which file is part of the archive. Hence, we still do not need to rely on host-nodejs for this package, at least not for this version. Signed-off-by: Thomas Claveirole Signed-off-by: Yann E. MORIN --- package/openlayers/openlayers.hash | 3 ++- package/openlayers/openlayers.mk | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 1c93b9a729..1b3f3cce51 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 8a9fda6e392688c049ebb88fb2c73b5788b4965b625443de4cca7d4688b1fb82 v6.14.1-dist.zip +sha256 37a0e5fde4df3db6e6c11ed0ceb8e20608121afe5f8f7f91cf03990e89a919ca v7.1.0-package.zip +sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 4626e7545a..7396e38fb9 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,21 +4,19 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.14.1 -OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip +OPENLAYERS_VERSION = 7.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 -# There's no separate license file in the archive, only minified files. +OPENLAYERS_LICENSE_FILES = LICENSE.md define OPENLAYERS_EXTRACT_CMDS unzip $(OPENLAYERS_DL_DIR)/$(OPENLAYERS_SOURCE) -d $(@D) - mv $(@D)/v$(OPENLAYERS_VERSION)-dist/* $(@D) - rmdir $(@D)/v$(OPENLAYERS_VERSION)-dist/ endef define OPENLAYERS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/ol.css $(TARGET_DIR)/var/www/ol.css - $(INSTALL) -D -m 0644 $(@D)/ol.js $(TARGET_DIR)/var/www/ol.js + $(INSTALL) -D -m 0644 $(@D)/dist/ol.js $(TARGET_DIR)/var/www/ol.js endef $(eval $(generic-package)) From 812b8526f8e6260d8ea90b6d4aff7d7788614b1f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Sep 2022 21:07:45 +0200 Subject: [PATCH 136/140] package/qemu: bump to version 7.1.0 Remove upstream commit: 0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch Changes log: https://wiki.qemu.org/ChangeLog/7.1 vnc-png option renamed to png: https://gitlab.com/qemu-project/qemu/-/commit/95f8510ef428f988897176b9585b8ba1432f939f linux-user has been fixed to build with glibc >= 2.36 (sys/mount.h): https://gitlab.com/qemu-project/qemu/-/commit/3cd3df2a9584e6f753bb62a0028bd67124ab5532 Runtime tested in gitlab: https://gitlab.com/kubu93/buildroot/-/pipelines/630473210 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...ll.c-fix-build-without-RLIMIT_RTTIME.patch | 48 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 8 ++-- 3 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch diff --git a/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch deleted file mode 100644 index 729c2e9be8..0000000000 --- a/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 84863e007d4ef0858e74a1250e2472954924c617 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 14 May 2022 16:10:16 +0200 -Subject: [PATCH] linux-user/syscall.c: fix build without RLIMIT_RTTIME - -RLIMIT_RTTIME is not provided by uclibc-ng or by musl prior to version -1.2.0 and -https://github.com/bminor/musl/commit/2507e7f5312e79620f6337935d0a6c9045ccba09 -resulting in the following build failure since -https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7: - -../linux-user/syscall.c: In function 'target_to_host_resource': -../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'? - 1057 | return RLIMIT_RTTIME; - | ^~~~~~~~~~~~~ - | RLIMIT_NOFILE - -Fixes: - - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://patchwork.ozlabs.org/project/qemu-devel/patch/20220523105239.1499162-1-fontaine.fabrice@gmail.com] ---- -Changes v1 -> v2 (after review of Laurent Vivier): - - Use an ifdef block instead of defining RLIMIT_RTTIME - - linux-user/syscall.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index dd0d92ba4e..488facb356 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -1053,8 +1053,10 @@ static inline int target_to_host_resource(int code) - return RLIMIT_RSS; - case TARGET_RLIMIT_RTPRIO: - return RLIMIT_RTPRIO; -+#ifdef RLIMIT_RTTIME - case TARGET_RLIMIT_RTTIME: - return RLIMIT_RTTIME; -+#endif - case TARGET_RLIMIT_SIGPENDING: - return RLIMIT_SIGPENDING; - case TARGET_RLIMIT_STACK: --- -2.35.1 - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 9c1a85a347..06d090bd1d 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839 qemu-7.0.0.tar.xz +sha256 a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 qemu-7.1.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 9e1bec3836..57d7e31cb6 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 7.0.0 +QEMU_VERSION = 7.1.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -124,10 +124,10 @@ QEMU_OPTS += \ --disable-vnc-sasl QEMU_DEPENDENCIES += libvncserver ifeq ($(BR2_PACKAGE_LIBPNG),y) -QEMU_OPTS += --enable-vnc-png +QEMU_OPTS += --enable-png QEMU_DEPENDENCIES += libpng else -QEMU_OPTS += --disable-vnc-png +QEMU_OPTS += --disable-png endif ifeq ($(BR2_PACKAGE_JPEG),y) QEMU_OPTS += --enable-vnc-jpeg @@ -388,7 +388,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vhost-user-blk-server \ --disable-virtiofsd \ --disable-vnc-jpeg \ - --disable-vnc-png \ + --disable-png \ --disable-vnc-sasl \ --enable-tools \ $(HOST_QEMU_OPTS) From 7317875802ce466e8883c173f0d195e4ed9e0747 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 6 Sep 2022 22:21:57 -0700 Subject: [PATCH 137/140] package/go: security bump to version 1.19.1 go1.19.1 includes security fixes to the net/http and net/url packages, as well as bug fixes to the compiler, the go command, the pprof command, the linker, the runtime, and the crypto/tls and crypto/x509 packages. https://github.com/golang/go/issues?q=milestone%3AGo1.19.1+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- 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 2b877145e9..657475adef 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9 go1.19.src.tar.gz +sha256 27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179 go1.19.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 2220953e55..9f0fbbde00 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19 +GO_VERSION = 1.19.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 3461465ac0eca058b616199692abafc64aad2e7f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Sep 2022 18:15:56 +0200 Subject: [PATCH 138/140] nezha_defconfig: bump opensbi, u-boot and linux Opensbi is now based on 1.1, U-Boot on 2022.07-rc3 and Linux on 5.19-rc1. We don't yet support 5.19 kernel headers, so use 5.17 instead. The incompatibility between opensbi and u-boot is now fixed, so drop 0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch. The updated device tree in the kernel tree no longer specifies a memory node (and the board exists in 512M/1G/2G variants, so instead use the (otherwise identical) device tree provided by u-boot, where the memory node is fixed up based on the detected memory size. On riscv, the linux kernel unconditionally wants to build its bundled dtc, so it needs flex and bison, even if it is not going to build any DTB. We can get flex and bison either via the system ones, or we get them as they are in LINUX_KCONFIG_DEPENDENCIES. However, relying on this is a bit fragile, so we keep asking the kernel to build a DTB, so that we do ensure that our host-{flex,bison} are built and in the dependency chain of the kernel (for PPD). Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: - extend on why we keep building a DTB from the kernel ] Signed-off-by: Yann E. MORIN --- .../nezha/overlay/boot/extlinux/extlinux.conf | 2 +- ...port-building-u-boot.toc1-for-nezda.patch} | 0 ...un20i-d1.dtsi-adjust-plic-compatible.patch | 36 ------------------- configs/nezha_defconfig | 8 ++--- 4 files changed, 5 insertions(+), 41 deletions(-) rename board/nezha/patches/uboot/{0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch => 0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch} (100%) delete mode 100644 board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch diff --git a/board/nezha/overlay/boot/extlinux/extlinux.conf b/board/nezha/overlay/boot/extlinux/extlinux.conf index 02232f4d16..91b2298628 100644 --- a/board/nezha/overlay/boot/extlinux/extlinux.conf +++ b/board/nezha/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label linux kernel /boot/Image - devicetree /boot/sun20i-d1-nezha.dtb + # use devicetree from u-boot append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch b/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch similarity index 100% rename from board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch rename to board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch diff --git a/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch b/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch deleted file mode 100644 index 3524f44a61..0000000000 --- a/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99cf8f37ceb1def9e7bbaccc395cf2275723e03d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:15:13 +0100 -Subject: [PATCH] arch/riscv/dts/sun20i-d1.dtsi: adjust plic compatible to - match opensbi - -The T-HEAD PLIC is by default not accessible from S-mode, and access must be -enabled by opensbi to make it accessible to Linux. - -The DTB is used both by U-Boot and opensbi (but the PLIC node is ignored by -U-Boot), so change the compatible to match what opensbi expects to fix a -crash during Linux boot: - -https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd - -Signed-off-by: Peter Korsgaard ---- - arch/riscv/dts/sun20i-d1.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/riscv/dts/sun20i-d1.dtsi b/arch/riscv/dts/sun20i-d1.dtsi -index 280e0336d4..56d02c33b0 100644 ---- a/arch/riscv/dts/sun20i-d1.dtsi -+++ b/arch/riscv/dts/sun20i-d1.dtsi -@@ -1136,7 +1136,7 @@ - - plic: interrupt-controller@10000000 { - compatible = "allwinner,sun20i-d1-plic", -- "sifive,plic-1.0.0"; -+ "thead,c900-plic"; - reg = <0x10000000 0x4000000>; - #address-cells = <0>; - interrupts-extended = <&cpu0_intc 11>, --- -2.20.1 - diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 2d66d6cb4a..7a7e86ceab 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,12 +1,12 @@ BR2_riscv=y BR2_GLOBAL_PATCH_DIR="board/nezha/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y 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,012f5a3d01be6d44e32c74bb3637ec281790b297)/linux-012f5a3d01be6d44e32c74bb3637ec281790b297.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,fe178cf0153d98b71cb01a46c8cc050826a17e77)/linux-fe178cf0153d98b71cb01a46c8cc050826a17e77.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nezha" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" @@ -16,14 +16,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,b9125c6f8909d1cc0417795737fc13cb6297ff11)/opensbi-b9125c6f8909d1cc0417795737fc13cb6297ff11.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_SUN20I_D1_SPL=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,smaeul,u-boot,62392d3b8a624a80646c1876533336f90140088d)/uboot-62392d3b8a624a80646c1876533336f90140088d.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,d1-2022-05-26)/uboot-d1-2022-05-26.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From b30ee98da976210c9ceb971fb944434944031642 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Sep 2022 18:15:57 +0200 Subject: [PATCH 139/140] nezha_defconfig: configure eth0 using DHCP With the move to 5.19-rc1, the ethernet interface is now supported. Configure it using DHCP at startup. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/nezha_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 7a7e86ceab..2e2df3c09d 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,6 +1,7 @@ BR2_riscv=y BR2_GLOBAL_PATCH_DIR="board/nezha/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=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" From 97599b76f543c8c34eac9e4fda168726c9f3a3d1 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 6 Sep 2022 14:44:35 +0300 Subject: [PATCH 140/140] package/cog: bump to version 0.14.1 This is a small bugfix release which solves a coupld of build issues. Release notes: https://wpewebkit.org/release/cog-0.14.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 3fd480c2a8..aa128d73d8 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.14.0.tar.xz.sums -md5 2352aaba1a4ff31b1d1fb559c4941a01 cog-0.14.0.tar.xz -sha1 2da37ea6c25e45425aa80de4a129484ee226dd96 cog-0.14.0.tar.xz -sha256 e23936f1ce350ea5ea6fa0709b63d34776b05709388aed9c6cf3fdc41299de9f cog-0.14.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.14.1.tar.xz.sums +md5 69d72ac046a0fc485ea7b61b96e7e7fc cog-0.14.1.tar.xz +sha1 6236972b0ae0bce38a0a017610f161b349723862 cog-0.14.1.tar.xz +sha256 fb91104e25e1dde27189c91c70acc356e387f47acebaa8997e01ce5879c3a600 cog-0.14.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 348c17c336..5f7abcab1f 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.14.0 +COG_VERSION = 0.14.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES