diff --git a/.checkpackageignore b/.checkpackageignore index 0956243143..88fe914d4a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -107,11 +107,6 @@ boot/at91dataflashboot/0001-do-not-install.patch Upstream boot/at91dataflashboot/0002-eabi-fixes.patch Upstream boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch Upstream boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch Upstream -boot/lpc32xxcdl/0001-compiler_name.patch Upstream -boot/lpc32xxcdl/0002-delete_redundant_files.patch Upstream -boot/lpc32xxcdl/0003-libnosys_gnu.patch Upstream -boot/lpc32xxcdl/0004-slashes.patch Upstream -boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch Upstream boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch Upstream boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch Upstream @@ -267,9 +262,6 @@ package/chrony/S49chrony Indent Shellcheck Variables package/cmake/0001-rename-cmake-rootfile.patch Upstream package/cmocka/0001-Don-t-redefine-uintptr_t.patch Upstream package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch Upstream -package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch Upstream -package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch Upstream -package/connman/0003-wispr-Update-portal-context-references.patch Upstream package/connman/S45connman Variables package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch Upstream package/coremark-pro/coremark-pro.sh.in Shellcheck @@ -394,7 +386,7 @@ package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch Upstream package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch Upstream package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch Upstream -package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch Upstream +package/elf2flt/0006-xtensa-fix-text-relocations.patch Upstream package/elftosb/0001-fixes-includes.patch Upstream package/elftosb/0002-force-cxx-compiler.patch Upstream package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch Upstream diff --git a/CHANGES b/CHANGES index 5ed0568bec..d000ee9454 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,35 @@ +2023.08-rc2, released August 20th, 2023 + + Fixes all over the tree. + + Toolchains: Only show external toolchains based on a GCC + version supporting the selected architecture + variant. Correctly mark Codescape MIPS external toolchains as + not providing a gdbserver. + + Defconfigs: Andes ae350_45: Drop custom U-Boot march setting, + breaking builds with GCC 12. Nitrogen*: Bump + U-Boot/Linux. Nitrogen8*: Use ATF 2.8, fixing array bounds + errors. QEMU m68k: Add Linux patch to fix build issue with + binutils >= 2.41. Raspberrypi*: Enable console on HDMI when + using systemd as well. + + Updated/fixed packages: at91dataflashboot, aubio, berkeleydb, + bwm-ng, ccache, check, chocolate-doom, compiler-rt, composer, + conmon, connman, dav1d, diffutils, dracut, e2fsprogs, elf2flt, + esp-hosted, flite, gcc, gdb, go-bootstrap-stage2, + intel-microcode, kodi-imagedecoder-heif, less, libcoap, + libedit, libglib2, libksba, liblo, libserial, log4cxx, lsof, + luvi, meson, mosquitto, mpd, mpv, mv-ddr-marvell, nftables, + ntpsec, openssh, optee-test, perftest, python-botocore, + python-docker, python-pylibfdt, python3, screenfetch, + sentry-cli, sngrep, stellarium, trinity, tvheadend, uboot, + uclibc, util-linux, xfsprogs, yajl + + New packages: nftables-python, xlib_libXpresent + + Removed packages: lpc32xxcdl + 2023.08-rc1, released August 5, 2023 Numerous package updates and fixes, additional runtime tests. diff --git a/Config.in.legacy b/Config.in.legacy index 1f9960b6eb..daf83dda4a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,7 +144,7 @@ endif ############################################################################### -comment "Legacy options removed in 2023.08" +comment "Legacy options removed in 2023.11" config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS bool "google-material-design-icons removed" @@ -158,6 +158,14 @@ config BR2_GDB_VERSION_10 help gdb 10.x has been removed, use a newer version. +comment "Legacy options removed in 2023.08" + +config BR2_TARGET_LPC32XXCDL + bool "lpc32xxcdl has been removed" + select BR2_LEGACY + help + lpc32xxcdl has been removed, due to licensing concerns. + config BR2_BINUTILS_VERSION_2_38_X bool "binutils 2.38.x has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 10a16b03c5..abd633f840 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1033,6 +1033,7 @@ F: package/tinycbor/ F: package/tinydtls/ F: package/tinymembench/ F: package/whois/ +F: package/x11r7/xlib_libXpresent/ F: package/zeek/ N: Fabrice Goucem @@ -1803,6 +1804,8 @@ F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_ncdu.py +F: support/testing/tests/package/test_nftables.py +F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ diff --git a/Makefile b/Makefile index e5aae17602..da52a51716 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: # Set and export the version string export BR2_VERSION := 2023.11-git # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1691269000 +BR2_VERSION_EPOCH = 1692567000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch new file mode 100644 index 0000000000..1f1ed75ae0 --- /dev/null +++ b/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch @@ -0,0 +1,97 @@ +From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Fri, 16 Jun 2023 17:36:10 +0200 +Subject: [PATCH] m68k: Fix invalid .section syntax + +gas supports several different forms for .section for ELF targets, +including: + .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] +and: + .section "NAME"[, #FLAGS...] + +In several places we use a mix of these two forms: + .section NAME, #FLAGS... + +A current development snapshot of binutils (2.40.50.20230611) treats +this mixed syntax as an error. + +Change to consistently use: + .section NAME, "FLAGS" +as is used elsewhere in the kernel. + +Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 +Signed-off-by: Ben Hutchings +Tested-by: Jan-Benedict Glaw +Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC@decadent.org.uk +Signed-off-by: Geert Uytterhoeven +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 +Signed-off-by: Thomas Petazzoni +--- + arch/m68k/fpsp040/skeleton.S | 4 ++-- + arch/m68k/ifpsp060/os.S | 4 ++-- + arch/m68k/kernel/relocate_kernel.S | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S +index 439395aa6fb4..081922c72daa 100644 +--- a/arch/m68k/fpsp040/skeleton.S ++++ b/arch/m68k/fpsp040/skeleton.S +@@ -499,13 +499,13 @@ in_ea: + dbf %d0,morein + rts + +- .section .fixup,#alloc,#execinstr ++ .section .fixup,"ax" + .even + 1: + jbsr fpsp040_die + jbra .Lnotkern + +- .section __ex_table,#alloc ++ .section __ex_table,"a" + .align 4 + + .long in_ea,1b +diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S +index 7a0d6e428066..89e2ec224ab6 100644 +--- a/arch/m68k/ifpsp060/os.S ++++ b/arch/m68k/ifpsp060/os.S +@@ -379,11 +379,11 @@ _060_real_access: + + + | Execption handling for movs access to illegal memory +- .section .fixup,#alloc,#execinstr ++ .section .fixup,"ax" + .even + 1: moveq #-1,%d1 + rts +-.section __ex_table,#alloc ++.section __ex_table,"a" + .align 4 + .long dmrbuae,1b + .long dmrwuae,1b +diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S +index ab0f1e7d4653..f7667079e08e 100644 +--- a/arch/m68k/kernel/relocate_kernel.S ++++ b/arch/m68k/kernel/relocate_kernel.S +@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) + lea %pc@(.Lcopy),%a4 + 2: addl #0x00000000,%a4 /* virt_to_phys() */ + +- .section ".m68k_fixup","aw" ++ .section .m68k_fixup,"aw" + .long M68K_FIXUP_MEMOFFSET, 2b+2 + .previous + +@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) + lea %pc@(.Lcont040),%a4 + 5: addl #0x00000000,%a4 /* virt_to_phys() */ + +- .section ".m68k_fixup","aw" ++ .section .m68k_fixup,"aw" + .long M68K_FIXUP_MEMOFFSET, 5b+2 + .previous + +-- +2.41.0 + diff --git a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch new file mode 100644 index 0000000000..1f1ed75ae0 --- /dev/null +++ b/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch @@ -0,0 +1,97 @@ +From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Fri, 16 Jun 2023 17:36:10 +0200 +Subject: [PATCH] m68k: Fix invalid .section syntax + +gas supports several different forms for .section for ELF targets, +including: + .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] +and: + .section "NAME"[, #FLAGS...] + +In several places we use a mix of these two forms: + .section NAME, #FLAGS... + +A current development snapshot of binutils (2.40.50.20230611) treats +this mixed syntax as an error. + +Change to consistently use: + .section NAME, "FLAGS" +as is used elsewhere in the kernel. + +Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 +Signed-off-by: Ben Hutchings +Tested-by: Jan-Benedict Glaw +Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC@decadent.org.uk +Signed-off-by: Geert Uytterhoeven +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 +Signed-off-by: Thomas Petazzoni +--- + arch/m68k/fpsp040/skeleton.S | 4 ++-- + arch/m68k/ifpsp060/os.S | 4 ++-- + arch/m68k/kernel/relocate_kernel.S | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S +index 439395aa6fb4..081922c72daa 100644 +--- a/arch/m68k/fpsp040/skeleton.S ++++ b/arch/m68k/fpsp040/skeleton.S +@@ -499,13 +499,13 @@ in_ea: + dbf %d0,morein + rts + +- .section .fixup,#alloc,#execinstr ++ .section .fixup,"ax" + .even + 1: + jbsr fpsp040_die + jbra .Lnotkern + +- .section __ex_table,#alloc ++ .section __ex_table,"a" + .align 4 + + .long in_ea,1b +diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S +index 7a0d6e428066..89e2ec224ab6 100644 +--- a/arch/m68k/ifpsp060/os.S ++++ b/arch/m68k/ifpsp060/os.S +@@ -379,11 +379,11 @@ _060_real_access: + + + | Execption handling for movs access to illegal memory +- .section .fixup,#alloc,#execinstr ++ .section .fixup,"ax" + .even + 1: moveq #-1,%d1 + rts +-.section __ex_table,#alloc ++.section __ex_table,"a" + .align 4 + .long dmrbuae,1b + .long dmrwuae,1b +diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S +index ab0f1e7d4653..f7667079e08e 100644 +--- a/arch/m68k/kernel/relocate_kernel.S ++++ b/arch/m68k/kernel/relocate_kernel.S +@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) + lea %pc@(.Lcopy),%a4 + 2: addl #0x00000000,%a4 /* virt_to_phys() */ + +- .section ".m68k_fixup","aw" ++ .section .m68k_fixup,"aw" + .long M68K_FIXUP_MEMOFFSET, 2b+2 + .previous + +@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) + lea %pc@(.Lcont040),%a4 + 5: addl #0x00000000,%a4 /* virt_to_phys() */ + +- .section ".m68k_fixup","aw" ++ .section .m68k_fixup,"aw" + .long M68K_FIXUP_MEMOFFSET, 5b+2 + .previous + +-- +2.41.0 + diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt index 059f55fbc9..b57c97464a 100644 --- a/board/qemu/ppc64le-powernv8/readme.txt +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig +qemu-system-ppc64 -M powernv9 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=output/images/rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig The login prompt will appear in the terminal window. diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 811d42a79b..6d65cb7bb8 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1 +1,4 @@ CONFIG_R8169=y +# Disable Rockchip specific WiFi drivers, as the kernel +# code cannot be build with GCC 12 due to several Werrors +# CONFIG_WL_ROCKCHIP is not set diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch new file mode 100644 index 0000000000..5632c5a627 --- /dev/null +++ b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch @@ -0,0 +1,64 @@ +From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 +From: Kees Cook +Date: Sat, 12 Feb 2022 09:14:49 -0800 +Subject: etherdevice: Adjust ether_addr* prototypes to silence + -Wstringop-overead +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With GCC 12, -Wstringop-overread was warning about an implicit cast from +char[6] to char[8]. However, the extra 2 bytes are always thrown away, +alignment doesn't matter, and the risk of hitting the edge of unallocated +memory has been accepted, so this prototype can just be converted to a +regular char *. Silences: + +net/core/dev.c: In function ‘bpf_prog_run_generic_xdp’: net/core/dev.c:4618:21: warning: ‘ether_addr_equal_64bits’ reading 8 bytes from a region of size 6 [-Wstringop-overread] + 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +net/core/dev.c:4618:21: note: referencing argument 1 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’} +net/core/dev.c:4618:21: note: referencing argument 2 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’} +In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ‘ether_addr_equal_64bits’ + 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Reported-by: Marc Kleine-Budde +Tested-by: Marc Kleine-Budde +Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73@pengutronix.de +Cc: Jakub Kicinski +Cc: "David S. Miller" +Cc: netdev@vger.kernel.org +Signed-off-by: Kees Cook +Signed-off-by: David S. Miller +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd +Signed-off-by: Kilian Zinnecker +--- + include/linux/etherdevice.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h +index 2ad71cc90b37d..92b10e67d5f87 100644 +--- a/include/linux/etherdevice.h ++++ b/include/linux/etherdevice.h +@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) + #endif + } + +-static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) ++static inline bool is_multicast_ether_addr_64bits(const u8 *addr) + { + #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 + #ifdef __BIG_ENDIAN +@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) + * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. + */ + +-static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], +- const u8 addr2[6+2]) ++static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) + { + #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 + u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); +-- +cgit + diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch new file mode 100644 index 0000000000..10de6c72d3 --- /dev/null +++ b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch @@ -0,0 +1,43 @@ +From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 +From: Xiongwei Song +Date: Fri, 14 Jan 2022 14:07:24 -0800 +Subject: mm: page_alloc: fix building error on -Werror=array-compare + +Arthur Marsh reported we would hit the error below when building kernel +with gcc-12: + + CC mm/page_alloc.o + mm/page_alloc.c: In function `mem_init_print_info': + mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] + 8173 | if (start <= pos && pos < end && size > adj) \ + | + +In C++20, the comparision between arrays should be warned. + +Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean@me.com +Signed-off-by: Xiongwei Song +Reported-by: Arthur Marsh +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f +Signed-off-by: Kilian Zinnecker +--- + mm/page_alloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 806f317c2e7e2..c4ef450ac4428 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) + */ + #define adj_init_size(start, end, size, pos, adj) \ + do { \ +- if (start <= pos && pos < end && size > adj) \ ++ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ + size -= adj; \ + } while (0) + +-- +cgit + diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index a88b9b46fa..f02f3d380e 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -60,3 +60,23 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 + +Issues: +======= + +The custom Radxa kernel provides custom code to support WiFi. However, +that code does not compile with GCC 12, which is the current default +version in buildroot. Hence, the WiFi kernel drivers are disabled, until +the issues get fixed (if ever). If they are desperately needed, one may +apply the following workaround, as long as buildroot still supports GCC +version 11: + +1. Set GCC version 11, by adding the following line to +configs/rock5b_defconfig: + +BR2_GCC_VERSION_11_X=y + +2. Re-enable custom WiFi drivers by removing the following line from +board/radxa/rock5b/linux.fragment: + +# CONFIG_WL_ROCKCHIP is not set diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index b24256fcea..38fdc80734 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -8,6 +8,11 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab +# systemd doesn't use /etc/inittab, enable getty.tty1.service instead +elif [ -d ${TARGET_DIR}/etc/systemd ]; then + mkdir -p "${TARGET_DIR}/etc/systemd/system/getty.target.wants" + ln -sf /lib/systemd/system/getty@.service \ + "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi # exnsure overlays exists for genimage diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index 627c8ac41a..192354b5be 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -1,6 +1,6 @@ #!/bin/sh -# By default U-Boot loads DTB from a file named "devicetree.dtb", so +# By default U-Boot loads DTB from a file named "system.dtb", so # let's use a symlink with that name that points to the *first* # devicetree listed in the config. diff --git a/boot/Config.in b/boot/Config.in index 58366e035e..9d7f5c4cb9 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/edk2/Config.in" source "boot/grub2/Config.in" -source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/optee-os/Config.in" diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index c66f27e343..cb329a90df 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -11,9 +11,14 @@ AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES +AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AT91DATAFLASHBOOT_CFLAGS += -marm +endif + define AT91DATAFLASHBOOT_BUILD_CMDS make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" + CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS diff --git a/boot/lpc32xxcdl/0001-compiler_name.patch b/boot/lpc32xxcdl/0001-compiler_name.patch deleted file mode 100644 index 6aecbdeba6..0000000000 --- a/boot/lpc32xxcdl/0001-compiler_name.patch +++ /dev/null @@ -1,52 +0,0 @@ -Use CROSS_COMPILE as compiler name and stop using libc - -Signed-off-by: Alexandre Belloni ---- - makerule/lpc32xx/make.lpc32xx.gnu | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu -index 1014c28..3277d99 100644 ---- a/makerule/lpc32xx/make.lpc32xx.gnu -+++ b/makerule/lpc32xx/make.lpc32xx.gnu -@@ -27,19 +27,19 @@ CFLAGS += -mno-sched-prolog -fno-hosted -mno-thumb-interwork -ffunction-sectio - CFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - AFLAGS = -mcpu=arm926ej-s - AFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) --CC = arm-none-eabi-gcc --AS = arm-none-eabi-as --AR = arm-none-eabi-ar -r --LD = arm-none-eabi-gcc --NM = arm-none-eabi-nm --OBJDUMP = arm-none-eabi-objdump --OBJCOPY = arm-none-eabi-objcopy --READELF = arm-none-eabi-readelf -+CC = $(CROSS_COMPILE)gcc -+AS = $(CROSS_COMPILE)as -+AR = $(CROSS_COMPILE)ar -r -+LD = $(CROSS_COMPILE)gcc -+NM = $(CROSS_COMPILE)nm -+OBJDUMP = $(CROSS_COMPILE)objdump -+OBJCOPY = $(CROSS_COMPILE)objcopy -+READELF = $(CROSS_COMPILE)readelf - LDFLAGS += -Wl,--gc-sections - - LK = -static - LK += -Wl,--start-group $(TARGET_CSP_LIB) $(TARGET_BSP_LIB) $(TARGET_GEN_LIB) --LK += -lgcc -lc -lg -lm -lstdc++ -lsupc++ -+LK += -nostdlib -lgcc #-lc -lg -lm -lstdc++ -lsupc++ - LK += -Wl,--end-group - MAP = -Xlinker -Map -Xlinker - LDESC = -Xlinker -T -@@ -47,6 +47,6 @@ ENTRY = -e - BIN = -bin - EXT = .elf - LEXT = --ELFTOREC =arm-none-eabi-objcopy -O srec --strip-all --verbose --ELFTOBIN =arm-none-eabi-objcopy -I elf32-littlearm -O binary --strip-all --verbose -+ELFTOREC = $(OBJCOPY) -O srec --strip-all --verbose -+ELFTOBIN = $(OBJCOPY) -I elf32-littlearm -O binary --strip-all --verbose - REC =.srec --- -1.7.7.3 - diff --git a/boot/lpc32xxcdl/0002-delete_redundant_files.patch b/boot/lpc32xxcdl/0002-delete_redundant_files.patch deleted file mode 100644 index 39966f01e9..0000000000 --- a/boot/lpc32xxcdl/0002-delete_redundant_files.patch +++ /dev/null @@ -1,969 +0,0 @@ -Remove duplicated files to stop the linker from complaining about duplicate -symbols - -Signed-off-by: Alexandre Belloni ---- ---- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sysapi_timer.c 2011-10-05 19:10:37.000000000 +0200 -+++ /dev/null 2012-01-01 16:39:47.918907000 +0100 -@@ -1,212 +0,0 @@ --/*********************************************************************** -- * $Id:: sysapi_timer.c 3394 2010-05-06 17:56:27Z usb10132 $ -- * -- * Project: Time support functions -- * -- * Description: -- * Implements the following functions required for the S1L API -- * time_init -- * time_reset -- * time_start -- * time_stop -- * time_get -- * time_get_rate -- * -- *********************************************************************** -- * Software that is described herein is for illustrative purposes only -- * which provides customers with programming information regarding the -- * products. This software is supplied "AS IS" without any warranties. -- * NXP Semiconductors assumes no responsibility or liability for the -- * use of the software, conveys no license or title under any patent, -- * copyright, or mask work right to the product. NXP Semiconductors -- * reserves the right to make changes in the software without -- * notification. NXP Semiconductors also make no representation or -- * warranty that such application will be suitable for the specified -- * use without further testing or modification. -- **********************************************************************/ -- --#include "s1l_sys_inf.h" --#include "lpc32xx_intc_driver.h" --#include "lpc32xx_timer_driver.h" -- --static UNS_64 base_rate; --static INT_32 tdev = 0; -- --/*********************************************************************** -- * -- * Function: time_init -- * -- * Purpose: Initializes time system -- * -- * Processing: Initializes the system timer. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: 0 if the init failed, otherwise non-zero -- * -- * Notes: None -- * -- **********************************************************************/ --INT_32 time_init(void) --{ -- TMR_PSCALE_SETUP_T pscale; -- -- /* Open timer driver */ -- if (tdev == 0) -- { -- tdev = timer_open((void *) TIMER_CNTR0, 0); -- if (tdev != 0) -- { -- /* Use a prescale count to 100000 */ -- pscale.ps_tick_val = 100000; -- pscale.ps_us_val = 0; /* Not needed when ps_tick_val != 0 */ -- timer_ioctl(tdev, TMR_SETUP_PSCALE, (INT_32) &pscale); -- -- /* Get timer clock rate */ -- base_rate = (UNS_64) timer_ioctl(tdev, TMR_GET_STATUS, -- TMR_GET_CLOCK); -- } -- } -- -- return tdev; --} -- --/*********************************************************************** -- * -- * Function: time_reset -- * -- * Purpose: Resets system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_reset(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_RESET, 1); -- } --} -- --/*********************************************************************** -- * -- * Function: time_start -- * -- * Purpose: Starts system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_start(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_ENABLE, 1); -- } --} -- --/*********************************************************************** -- * -- * Function: time_stop -- * -- * Purpose: Stops system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_stop(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_ENABLE, 0); -- } --} -- --/*********************************************************************** -- * -- * Function: time_get -- * -- * Purpose: Returns current system time value -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: The number of ticks of the timer counter -- * -- * Notes: None -- * -- **********************************************************************/ --UNS_64 time_get(void) --{ -- TMR_COUNTS_T tcounts; -- UNS_64 ticks = 0; -- -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_GET_COUNTS, (INT_32) &tcounts); -- -- /* Compute number of timer ticks */ -- ticks = (UNS_64) tcounts.count_val * 100000; -- ticks = ticks + (UNS_64) tcounts.ps_count_val; -- } -- -- return ticks; --} -- --/*********************************************************************** -- * -- * Function: time_get_rate -- * -- * Purpose: -- * Returns base tick rate (ticks per second) of the time counter -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: The timer tick rate (in ticks per second) -- * -- * Notes: None -- * -- **********************************************************************/ --UNS_64 time_get_rate(void) --{ -- return base_rate; --} -- ---- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sys_mmu_cmd_group.c 2011-10-05 19:10:37.000000000 +0200 -+++ /dev/null 2012-01-01 16:39:47.918907000 +0100 -@@ -1,746 +0,0 @@ --/*********************************************************************** -- * $Id:: sys_mmu_cmd_group.c 3430 2010-05-07 17:39:08Z usb10132 $ -- * -- * Project: Command processor for peek, poke, dump, and fill -- * -- * Description: -- * Processes commands from the command prompt -- * -- *********************************************************************** -- * Software that is described herein is for illustrative purposes only -- * which provides customers with programming information regarding the -- * products. This software is supplied "AS IS" without any warranties. -- * NXP Semiconductors assumes no responsibility or liability for the -- * use of the software, conveys no license or title under any patent, -- * copyright, or mask work right to the product. NXP Semiconductors -- * reserves the right to make changes in the software without -- * notification. NXP Semiconductors also make no representation or -- * warranty that such application will be suitable for the specified -- * use without further testing or modification. -- **********************************************************************/ -- --#include "lpc_arm922t_cp15_driver.h" --#include "lpc_string.h" --#include "startup.h" --#include "s1l_cmds.h" --#include "s1l_sys_inf.h" -- --/* dcache command */ --BOOL_32 cmd_dcache(void); --static UNS_32 cmd_dcache_plist[] = --{ -- (PARSE_TYPE_STR), /* The "dcache" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_dcache_cmd = --{ -- (UNS_8 *) "dcache", -- cmd_dcache, -- (UNS_8 *) "Enables, disables, or flushes data cache", -- (UNS_8 *) "dcache [0(disable), 1(enable), 2(flush)]", -- cmd_dcache_plist, -- NULL --}; -- --/* icache command */ --BOOL_32 cmd_icache(void); --static UNS_32 cmd_icache_plist[] = --{ -- (PARSE_TYPE_STR), /* The "icache" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_icache_cmd = --{ -- (UNS_8 *) "icache", -- cmd_icache, -- (UNS_8 *) "Enables or disables instruction cache", -- (UNS_8 *) "icache [0(disable), 1(enable)]", -- cmd_icache_plist, -- NULL --}; -- --/* inval command */ --BOOL_32 cmd_inval(void); --static UNS_32 cmd_inval_plist[] = --{ -- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "inval" command */ --}; --static CMD_ROUTE_T core_inval_cmd = --{ -- (UNS_8 *) "inval", -- cmd_inval, -- (UNS_8 *) "Flushes data cache and invalidates instruction cache", -- (UNS_8 *) "inval", -- cmd_inval_plist, -- NULL --}; -- --/* mmuenab command */ --BOOL_32 cmd_mmuenab(void); --static UNS_32 cmd_mmuenab_plist[] = --{ -- (PARSE_TYPE_STR), /* The "mmuenab" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_mmuenab_cmd = --{ -- (UNS_8 *) "mmuenab", -- cmd_mmuenab, -- (UNS_8 *) "Enables or disables the MMU", -- (UNS_8 *) "mmuenab [0(disable), 1(enable)]", -- cmd_mmuenab_plist, -- NULL --}; -- --/* map command */ --BOOL_32 cmd_map(void); --static UNS_32 cmd_map_plist[] = --{ -- (PARSE_TYPE_STR), /* The "map" command */ -- (PARSE_TYPE_HEX), -- (PARSE_TYPE_HEX), -- (PARSE_TYPE_DEC), -- (PARSE_TYPE_DEC | PARSE_TYPE_END), --}; --static CMD_ROUTE_T core_map_cmd = --{ -- (UNS_8 *) "map", -- cmd_map, -- (UNS_8 *) "Maps a range of physical address sections to virtual addresses", -- (UNS_8 *) "map [virt hex addr][phy hex addr][sections][0(uncached), 1(cached), 2(unmap)]", -- cmd_map_plist, -- NULL --}; -- --/* mmuinfo command */ --static BOOL_32 cmd_mmuinfo(void); --static UNS_32 cmd_mmuinfo_plist[] = --{ -- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "mmuinfo" command */ --}; --static CMD_ROUTE_T core_mmuinfo_cmd = --{ -- (UNS_8 *) "mmuinfo", -- cmd_mmuinfo, -- (UNS_8 *) "Dumps page table and MMU info", -- (UNS_8 *) "mmuinfo", -- cmd_mmuinfo_plist, -- NULL --}; -- --/* MMU group */ --static GROUP_LIST_T mmu_group = --{ -- (UNS_8 *) "mmu", /* mmu group */ -- (UNS_8 *) "MMU command group", -- NULL, -- NULL --}; -- --static UNS_8 enabled_msg [] =" enabled"; --static UNS_8 disabled_msg [] =" disabled"; --static UNS_8 dcache_msg[] = "Data cache"; --static UNS_8 icache_msg[] = "Instruction cache"; --static UNS_8 pagetab_msg[] = "Page table at address: "; --static UNS_8 slist_msg[] = "Type Virt Phy fl Size"; --static UNS_8 mmu_msg [] ="MMU"; --static UNS_8 cpage_msg[] = "Coarse page:"; --static UNS_8 fpage_msg[] = "Fine page :"; --static UNS_8 sect_msg[] = "Section :"; --static UNS_8 mbytes_msg[] = "M"; --static UNS_8 map1_err_msg[] = -- "Error : section addresses must be aligned on a 32-bit boundary"; --static UNS_8 map2_err_msg[] = -- "Error : Number of sections exceeds address range of device"; --static UNS_8 phya_msg[] = "Virtual address "; --static UNS_8 mapped_msg[] = " mapped to physical address "; --static UNS_8 unmapped_msg[] = " unmapped from physical address "; --static UNS_8 cached_msg[] = " (cached)"; --static UNS_8 inval_msg[] = " invalidated"; --static UNS_8 caches_msg [] ="Caches"; --static UNS_8 flushed_msg[] = " flushed"; -- --/*********************************************************************** -- * -- * Function: show_section -- * -- * Purpose: Display section information -- * -- * Processing: -- * See function. -- * -- * Parameters: -- * mmu_reg : MMU settings for this section -- * virt_addr : Starting virtual address for this section -- * segs : Number of 1M segments for this section -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --static void show_section(UNS_32 mmu_reg, -- UNS_32 virt_addr, -- UNS_32 segs) --{ -- UNS_8 straddr [16]; -- UNS_32 mmu_phy; -- -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) != -- ARM922T_L1D_TYPE_FAULT) -- { -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_CPAGE) -- { -- term_dat_out(cpage_msg); -- } -- else if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_FPAGE) -- { -- term_dat_out(fpage_msg); -- } -- else -- { -- term_dat_out(sect_msg); -- } -- -- /* Compute virtual address */ -- str_makehex(straddr, virt_addr, 8); -- term_dat_out(straddr); -- term_dat_out((UNS_8 *) " "); -- -- /* Compute mapped physical address */ -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_SECTION) -- { -- mmu_phy = mmu_reg & 0xFFF00000; -- } -- else -- { -- /* Don't compute addresses for non-sections */ -- mmu_phy = 0; -- } -- str_makehex(straddr, mmu_phy, 8); -- term_dat_out(straddr); -- term_dat_out((UNS_8 *) " "); -- -- /* MMU flags */ -- if ((mmu_reg & ARM922T_L1D_BUFFERABLE) != 0) -- { -- term_dat_out((UNS_8 *) "b"); -- } -- else -- { -- term_dat_out((UNS_8 *) " "); -- } -- if ((mmu_reg & ARM922T_L1D_CACHEABLE) != 0) -- { -- term_dat_out((UNS_8 *) "c"); -- } -- else -- { -- term_dat_out((UNS_8 *) " "); -- } -- term_dat_out((UNS_8 *) " "); -- -- /* Displays used megabytes */ -- str_makedec(straddr, segs); -- term_dat_out(straddr); -- term_dat_out_crlf(mbytes_msg); -- } --} -- --/*********************************************************************** -- * -- * Function: mmu_dumpinfo -- * -- * Purpose: Display MMU info -- * -- * Processing: -- * Display the MMU information, including enable status, cache -- * status, and page table. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 mmu_dumpinfo(void) --{ -- UNS_32 segsz, last_mmu_reg, mmu_vrt, mmu_reg, mmu_vrtsav = 0, *pt; -- UNS_32 mlast_mmu_reg, mmmu_reg; -- int idx; -- UNS_8 hexaddr [16]; -- -- term_dat_out(mmu_msg); -- if (cp15_mmu_enabled() == FALSE) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- -- /* Get MMU control register word */ -- mmu_reg = cp15_get_mmu_control_reg(); -- -- /* Instruction cache status */ -- term_dat_out(icache_msg); -- if ((mmu_reg & ARM922T_MMU_CONTROL_I) == 0) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- } -- -- /* Data cache status */ -- term_dat_out(dcache_msg); -- if ((mmu_reg & ARM922T_MMU_CONTROL_C) == 0) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- } -- -- term_dat_out(pagetab_msg); -- mmu_reg = (UNS_32) cp15_get_ttb(); -- str_makehex(hexaddr, mmu_reg, 8); -- term_dat_out_crlf(hexaddr); -- term_dat_out_crlf(slist_msg); -- -- /* Process MMU table - assume that the physical and -- virtual locations of table are the same */ -- pt = (UNS_32 *) mmu_reg; -- mmu_vrt = 0x0; -- segsz = 0xFFFFFFFF; -- last_mmu_reg = mlast_mmu_reg = 0xFFFFFFFF; -- for (idx = 0; idx < 4096; idx++) -- { -- mmu_reg = *pt; -- mmmu_reg = (mmu_reg & (ARM922T_L1D_TYPE_PG_SN_MASK | -- ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE)); -- segsz = segsz + 1; -- -- if ((last_mmu_reg != 0xFFFFFFFF) && -- (mlast_mmu_reg != mmmu_reg)) -- { -- show_section(last_mmu_reg, mmu_vrtsav, segsz); -- segsz = 0; -- } -- -- if (mlast_mmu_reg != mmmu_reg) -- { -- mmu_vrtsav = mmu_vrt; -- last_mmu_reg = mmu_reg; -- mlast_mmu_reg = mmmu_reg; -- } -- -- pt++; -- mmu_vrt += 0x00100000; -- } -- } -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: mmu_dumpmap -- * -- * Purpose: Map a virtual address range to a physical range -- * -- * Processing: -- * From the input addresses and number of sections, generate the -- * appropriate entries in the page table. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 mmu_dumpmap(UNS_32 vrt, -- UNS_32 phy, -- UNS_32 sections, -- UNS_32 cache) --{ -- BOOL_32 processed = FALSE; -- UNS_32 mmu_phy, mmu_vrt, tmp1 = 0, tmp2, *pt; -- UNS_8 hexaddr [16]; -- -- /* Verify address boundaries are sectional */ -- mmu_vrt = vrt & ~ARM922T_L2D_SN_BASE_MASK; -- mmu_phy = phy & ~ARM922T_L2D_SN_BASE_MASK; -- if ((mmu_vrt != 0) || (mmu_phy != 0)) -- { -- term_dat_out_crlf(map1_err_msg); -- } -- else -- { -- /* Verify that address range and section count will not -- exceed address range of device */ -- tmp1 = vrt >> 20; -- tmp1 = (tmp1 + sections) - 1; -- tmp2 = phy >> 20; -- tmp2 = (tmp2 + sections) - 1; -- if ((tmp1 < 4096) && (tmp2 < 4096)) -- { -- /* Good address range and good section count */ -- processed = TRUE; -- } -- else -- { -- term_dat_out_crlf(map2_err_msg); -- } -- } -- -- /* Generate static part of MMU word */ -- if (cache == 0) -- { -- /* Section mapped with cache disabled */ -- tmp1 = ARM922T_L1D_TYPE_SECTION; -- } -- else if (cache == 1) -- { -- /* Section mapped with cache enabled */ -- tmp1 = (ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE | -- ARM922T_L1D_TYPE_SECTION); -- } -- else if (cache == 2) -- { -- /* Section unmapped */ -- tmp1 = ARM922T_L1D_TYPE_FAULT; -- } -- tmp1 |= ARM922T_L1D_AP_ALL; -- -- /* Offset into page table for virtual address */ -- tmp2 = (vrt >> 20); -- pt = cp15_get_ttb() + tmp2; -- -- /* Loop until all sections are complete */ -- while ((sections > 0) && (processed == TRUE)) -- { -- /* Add in physical address */ -- tmp2 = tmp1 | (phy & ARM922T_L2D_SN_BASE_MASK); -- -- /* Save new section descriptor for virtual address */ -- *pt = tmp2; -- -- /* Output message shown the map */ -- term_dat_out(phya_msg); -- str_makehex(hexaddr, phy, 8); -- term_dat_out(hexaddr); -- if (cache == 2) -- { -- term_dat_out(unmapped_msg); -- } -- else -- { -- term_dat_out(mapped_msg); -- } -- str_makehex(hexaddr, vrt, 8); -- term_dat_out(hexaddr); -- if (cache == 1) -- { -- term_dat_out(cached_msg); -- } -- term_dat_out_crlf((UNS_8 *) ""); -- -- /* Next section and page table entry*/ -- phy += 0x00100000; -- vrt += 0x00100000; -- pt++; -- sections--; -- } -- -- return processed; --} -- --/*********************************************************************** -- * -- * Function: cmd_mmuinfo -- * -- * Purpose: Display MMU information -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 cmd_mmuinfo(void) --{ -- mmu_dumpinfo(); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_map -- * -- * Purpose: Map a physical address region to a virtual region -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_map(void) --{ -- UNS_32 phy, virt, sects, ce = 0; -- -- /* Get arguments */ -- virt = cmd_get_field_val(1); -- phy = cmd_get_field_val(2); -- sects = cmd_get_field_val(3); -- ce = cmd_get_field_val(4); -- -- if (ce <= 2) -- { -- mmu_dumpmap(virt, phy, sects, ce); -- } -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_inval -- * -- * Purpose: MMU cache flush and invalidate -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_inval(void) --{ -- dcache_flush(); -- icache_inval(); -- term_dat_out(caches_msg); -- term_dat_out(inval_msg); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_dcache -- * -- * Purpose: MMU data cache enable and disable -- * -- * Processing: -- * If the value passed in the parser is 1, enable the data cache, -- * otherwise disable the data cache. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_dcache(void) --{ -- UNS_32 cenable; -- UNS_8 *ppar; -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- switch (cenable) -- { -- case 0: -- dcache_flush(); -- cp15_set_dcache(0); -- ppar = disabled_msg; -- break; -- -- case 1: -- cp15_invalidate_cache(); -- cp15_set_dcache(1); -- ppar = enabled_msg; -- break; -- -- case 2: -- default: -- dcache_flush(); -- ppar = flushed_msg; -- break; -- } -- -- term_dat_out(dcache_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_icache -- * -- * Purpose: MMU instruction cache enable and disable -- * -- * Processing: -- * If the value passed in the parser is 1, enable the instruction -- * cache, otherwise disable the instruction cache. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_icache(void) --{ -- UNS_32 cenable; -- UNS_8 *ppar; -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- if (cenable == 1) -- { -- dcache_flush(); -- cp15_invalidate_cache(); -- cp15_set_icache(1); -- ppar = enabled_msg; -- } -- else -- { -- cp15_set_icache(0); -- ppar = disabled_msg; -- } -- -- term_dat_out(icache_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- -- --/*********************************************************************** -- * -- * Function: cmd_mmuenab -- * -- * Purpose: Enable or disable MMU -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_mmuenab(void) --{ -- UNS_8 *ppar; -- UNS_32 cenable; -- -- term_dat_out_crlf((UNS_8 *) "Warning: Changing MMU status on " -- " cached and buffered code can cause system crashes."); -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- if (cenable == 1) -- { -- if ((cp15_get_mmu_control_reg() & ARM922T_MMU_CONTROL_C) != 0) -- { -- cp15_invalidate_cache(); -- } -- -- cp15_set_mmu(1); -- ppar = enabled_msg; -- } -- else -- { -- cp15_dcache_flush(); -- cp15_write_buffer_flush(); -- cp15_invalidate_cache(); -- cp15_set_mmu(0); -- ppar = disabled_msg; -- } -- -- term_dat_out(mmu_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: mmu_cmd_group_init -- * -- * Purpose: Initialize MMU command group -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothin -- * -- * Notes: None -- * -- **********************************************************************/ --void mmu_cmd_group_init(void) --{ -- /* Add MMU group */ -- cmd_add_group(&mmu_group); -- -- /* Add commands to the MMU group */ -- cmd_add_new_command(&mmu_group, &core_dcache_cmd); -- cmd_add_new_command(&mmu_group, &core_icache_cmd); -- cmd_add_new_command(&mmu_group, &core_inval_cmd); -- cmd_add_new_command(&mmu_group, &core_mmuenab_cmd); -- cmd_add_new_command(&mmu_group, &core_map_cmd); -- cmd_add_new_command(&mmu_group, &core_mmuinfo_cmd); --} diff --git a/boot/lpc32xxcdl/0003-libnosys_gnu.patch b/boot/lpc32xxcdl/0003-libnosys_gnu.patch deleted file mode 100644 index cfd77bead6..0000000000 --- a/boot/lpc32xxcdl/0003-libnosys_gnu.patch +++ /dev/null @@ -1,188 +0,0 @@ -Fix compilation and eabi issues - -Since we are not linking with libc anymore, we need to define our own memset, -strlen and memcpy. Also, as we are using a *libc compiler, we need to "handle" -exceptions (mostly division by 0) by defining raise() and -__aeabi_unwind_cpp_pr0. - -Signed-off-by: Alexandre Belloni ---- - csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - 3 files changed, 123 insertions(+), 0 deletions(-) - -diff --git a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -index 385b0ab..f1f0a0a 100644 ---- a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ -diff --git a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -index 385b0ab..f1f0a0a 100644 ---- a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ -diff --git a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -index cfdb674..6b50c60 100644 ---- a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ --- -1.7.7.3 - diff --git a/boot/lpc32xxcdl/0004-slashes.patch b/boot/lpc32xxcdl/0004-slashes.patch deleted file mode 100644 index 94c184780e..0000000000 --- a/boot/lpc32xxcdl/0004-slashes.patch +++ /dev/null @@ -1,521 +0,0 @@ -Use slashes instead of backslashes - -Signed-off-by: Alexandre Belloni ---- - .../bsps/common/examples/buildfiles/makefile | 10 +++--- - .../startup/examples/burners/makefile.burner | 16 +++++----- - csps/lpc32xx/bsps/ea3250/source/makefile | 10 +++--- - csps/lpc32xx/bsps/fdi3250/source/makefile | 12 ++++---- - csps/lpc32xx/bsps/phy3250/examples/makefile | 2 +- - csps/lpc32xx/bsps/phy3250/source/makefile | 2 +- - .../examples/Burners/nor/kickstart/makefile | 2 +- - .../startup/examples/Burners/nor/norerase/makefile | 2 +- - .../startup/examples/Burners/nor/s1lapp/makefile | 2 +- - .../examples/Burners/spi/kickstart/makefile | 2 +- - csps/lpc32xx/source/makefile | 10 +++--- - lpc/source/makefile | 10 +++--- - makefile | 2 +- - makerule/common/make.rules.environment | 30 ++++++++++---------- - makerule/lpc32xx/make.lpc32xx.gnu | 2 +- - makerule/lpc32xx/make.lpc32xx.iar | 12 ++++---- - makerule/lpc32xx/make.lpc32xx.keil | 6 ++-- - makerule/lpc32xx/make.lpc32xx.rvw | 2 +- - 18 files changed, 67 insertions(+), 67 deletions(-) - -diff --git a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -index cf4977c..1da2201 100644 ---- a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -+++ b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -42,6 +42,6 @@ CFLAGS +=-I..\Include - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - -diff --git a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -index fca3947..18bd703 100644 ---- a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -+++ b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -@@ -22,9 +22,9 @@ - # - ######################################################################## - --COMMON_BASE := $(NXPMCU_SOFTWARE)\csps\$(CSP)\bsps\common --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) --include $(COMMON_BASE)\startup\examples\buildfiles\make.env -+COMMON_BASE := $(NXPMCU_SOFTWARE)/csps/$(CSP)/bsps/common -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) -+include $(COMMON_BASE)/startup/examples/buildfiles/make.env - - ######################################################################## - # ARM Realview -@@ -38,7 +38,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" - #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld - LDFLAGS = --remove - MAP = --map --info=totals,sizes,unused --symbols --list - endif -@@ -55,7 +55,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" - #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld - LDFLAGS = --remove - MAP = --map --info=totals,sizes,unused --symbols --list - endif -@@ -72,7 +72,7 @@ AFLAGS += --defsym USE_ALL_STACKS=1 - #AFLAGS += --defsym RW_RELOC=1 - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_gnu.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_gnu.ld - - endif - -@@ -108,7 +108,7 @@ endif - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes - - ######################################################################## - # -@@ -157,6 +157,6 @@ endif - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: debug bin -diff --git a/csps/lpc32xx/bsps/ea3250/source/makefile b/csps/lpc32xx/bsps/ea3250/source/makefile -index 7cada25..2899b20 100644 ---- a/csps/lpc32xx/bsps/ea3250/source/makefile -+++ b/csps/lpc32xx/bsps/ea3250/source/makefile -@@ -22,16 +22,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -64,7 +64,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/csps/lpc32xx/bsps/fdi3250/source/makefile b/csps/lpc32xx/bsps/fdi3250/source/makefile -index 4e153bb..11e4b63 100644 ---- a/csps/lpc32xx/bsps/fdi3250/source/makefile -+++ b/csps/lpc32xx/bsps/fdi3250/source/makefile -@@ -22,16 +22,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -53,7 +53,7 @@ lib_clean: - # delete all targets this Makefile can make and all built libraries - # linked in - lib_realclean: -- -@$(RM) $(BSP_LIB_DIR)\*.a -+ -@$(RM) $(BSP_LIB_DIR)/*.a - -@$(RMDIR) $(BSP_LIB_DIR) - - clean: lib_clean -@@ -65,7 +65,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/csps/lpc32xx/bsps/phy3250/examples/makefile b/csps/lpc32xx/bsps/phy3250/examples/makefile -index b939252..e7feaa6 100644 ---- a/csps/lpc32xx/bsps/phy3250/examples/makefile -+++ b/csps/lpc32xx/bsps/phy3250/examples/makefile -@@ -25,7 +25,7 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - SUBDIRS = adc dram_self_refresh hstimer hsuart i2c kscan lcd_colorbars - SUBDIRS += lcd_tsc mi2c mstimer pwm pwm_simple rtc sdcard sdcard_dma -diff --git a/csps/lpc32xx/bsps/phy3250/source/makefile b/csps/lpc32xx/bsps/phy3250/source/makefile -index 7c48e7d..750b776 100644 ---- a/csps/lpc32xx/bsps/phy3250/source/makefile -+++ b/csps/lpc32xx/bsps/phy3250/source/makefile -@@ -32,7 +32,7 @@ include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes - AFLAGS +=-I../Include - CFLAGS +=-I../Include - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -index 01e2b38..526d6cc 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -@@ -78,7 +78,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -index ce329f5..e81b8db 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -@@ -77,7 +77,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -index 4426fc7..196faec 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -@@ -77,7 +77,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -index dc73b64..39fc304 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -@@ -78,7 +78,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/source/makefile b/csps/lpc32xx/source/makefile -index 8e05456..16bd944 100644 ---- a/csps/lpc32xx/source/makefile -+++ b/csps/lpc32xx/source/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - - ######################################################################## -@@ -68,7 +68,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/lpc/source/makefile b/lpc/source/makefile -index 2860db9..ae7d612 100644 ---- a/lpc/source/makefile -+++ b/lpc/source/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -67,7 +67,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/makefile b/makefile -index 8645fcc..86fa6bc 100644 ---- a/makefile -+++ b/makefile -@@ -34,7 +34,7 @@ TARGETS_CLN =gen_clean csp_clean bsp_clean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # -diff --git a/makerule/common/make.rules.environment b/makerule/common/make.rules.environment -index d5737fe..4e6df48 100644 ---- a/makerule/common/make.rules.environment -+++ b/makerule/common/make.rules.environment -@@ -52,7 +52,7 @@ ASTYLE =astyle --options=$(BUILD_ROOT)/tools/astyle.cfg - # - ######################################################################## - --CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib -+CSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/lib - - ######################################################################## - # -@@ -60,7 +60,7 @@ CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib - # - ######################################################################## - --BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib -+BSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)/lib - - ######################################################################## - # -@@ -68,7 +68,7 @@ BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib - # - ######################################################################## - --GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib -+GEN_LIB_DIR =$(BUILD_ROOT)/$(GEN)/lib - - ######################################################################## - # -@@ -76,9 +76,9 @@ GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib - # - ######################################################################## - --CSP_DIR =$(BUILD_ROOT)\csps\$(CSP) --CSP_SRC_DIR =$(CSP_DIR)\source --CSP_INC_DIR =$(CSP_DIR)\include -+CSP_DIR =$(BUILD_ROOT)/csps/$(CSP) -+CSP_SRC_DIR =$(CSP_DIR)/source -+CSP_INC_DIR =$(CSP_DIR)/include - - ######################################################################## - # -@@ -86,9 +86,9 @@ CSP_INC_DIR =$(CSP_DIR)\include - # - ######################################################################## - --BSP_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP) --BSP_SRC_DIR =$(BSP_DIR)\source --BSP_INC_DIR =$(BSP_DIR)\include -+BSP_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP) -+BSP_SRC_DIR =$(BSP_DIR)/source -+BSP_INC_DIR =$(BSP_DIR)/include - - ######################################################################## - # -@@ -96,9 +96,9 @@ BSP_INC_DIR =$(BSP_DIR)\include - # - ######################################################################## - --GEN_DIR =$(BUILD_ROOT)\$(GEN) --GEN_SRC_DIR =$(GEN_DIR)\source --GEN_INC_DIR =$(GEN_DIR)\include -+GEN_DIR =$(BUILD_ROOT)/$(GEN) -+GEN_SRC_DIR =$(GEN_DIR)/source -+GEN_INC_DIR =$(GEN_DIR)/include - - ######################################################################## - # -@@ -151,6 +151,6 @@ endif - # - ######################################################################## - --TARGET_CSP_LIB =$(CSP_LIB_DIR)\$(CSP_ARCHIVE) --TARGET_BSP_LIB =$(BSP_LIB_DIR)\$(BSP_ARCHIVE) --TARGET_GEN_LIB =$(GEN_LIB_DIR)\$(GEN_ARCHIVE) -+TARGET_CSP_LIB =$(CSP_LIB_DIR)/$(CSP_ARCHIVE) -+TARGET_BSP_LIB =$(BSP_LIB_DIR)/$(BSP_ARCHIVE) -+TARGET_GEN_LIB =$(GEN_LIB_DIR)/$(GEN_ARCHIVE) -diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu -index 3277d99..d80b98d 100644 ---- a/makerule/lpc32xx/make.lpc32xx.gnu -+++ b/makerule/lpc32xx/make.lpc32xx.gnu -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CPU = arm926ej-s - CFLAGS = -mcpu=arm926ej-s -Wall -Os -diff --git a/makerule/lpc32xx/make.lpc32xx.iar b/makerule/lpc32xx/make.lpc32xx.iar -index 238ebbf..27d163f 100644 ---- a/makerule/lpc32xx/make.lpc32xx.iar -+++ b/makerule/lpc32xx/make.lpc32xx.iar -@@ -19,12 +19,12 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - --IARBASE = $(IAR_ROOT)\ARM --IARTOOLS = $(IARBASE)\bin --IAR_LIB = $(IARBASE)\lib --IAR_INC = $(IARBASE)\inc -+IARBASE = $(IAR_ROOT)/ARM -+IARTOOLS = $(IARBASE)/bin -+IAR_LIB = $(IARBASE)/lib -+IAR_INC = $(IARBASE)/inc - CC = iccarm - CCP = iccarm - AS = iasmarm -@@ -36,7 +36,7 @@ CFLAGS += -I"$(IAR_INC)" - AFLAGS = --cpu 5TEJ - LDFLAGS = - LK = "$(TARGET_GEN_LIB)" "$(TARGET_CSP_LIB)" "$(TARGET_BSP_LIB)" --;LK += "$(IAR_LIB)\dl4tpannl8f.r79" -+;LK += "$(IAR_LIB)/dl4tpannl8f.r79" - MAP = --map - LDESC = --config - ENTRY = --entry -diff --git a/makerule/lpc32xx/make.lpc32xx.keil b/makerule/lpc32xx/make.lpc32xx.keil -index dd27583..7334d3f 100644 ---- a/makerule/lpc32xx/make.lpc32xx.keil -+++ b/makerule/lpc32xx/make.lpc32xx.keil -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CC =armcc - CCP =armcc -@@ -27,11 +27,11 @@ AS =armasm - LD =armlink - AR =armar -r -s - CFLAGS =--arm -O3 -g --device DARMP3 -D__MICROLIB --CFLAGS +=-I$(KEIL_RVCT)\inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) -+CFLAGS +=-I$(KEIL_RVCT)/inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - AFLAGS =--arm --device=DARMP3 - AFLAGS +=-I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - LDFLAGS =--noremove --LK =--device DARMP3 --libpath $(KEIL_RVCT)\lib --scan $(TARGET_CSP_LIB) -+LK =--device DARMP3 --libpath $(KEIL_RVCT)/lib --scan $(TARGET_CSP_LIB) - LK +=--scan $(TARGET_BSP_LIB) - LK +=--scan $(TARGET_GEN_LIB) - MAP =--map --list -diff --git a/makerule/lpc32xx/make.lpc32xx.rvw b/makerule/lpc32xx/make.lpc32xx.rvw -index 59961dd..2419976 100644 ---- a/makerule/lpc32xx/make.lpc32xx.rvw -+++ b/makerule/lpc32xx/make.lpc32xx.rvw -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CC =armcc - CCP =armcpp --- -1.7.7.3 - diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in deleted file mode 100644 index 97137aa7d4..0000000000 --- a/boot/lpc32xxcdl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_TARGET_LPC32XXCDL - bool "LPC32XX CDL (kickstart and S1L)" - depends on BR2_arm926t - -if BR2_TARGET_LPC32XXCDL - -config BR2_TARGET_LPC32XXCDL_BOARDNAME - string "LPC32xx board name" - -endif #BR2_TARGET_LPC32XXCDL diff --git a/boot/lpc32xxcdl/lpc32xxcdl.hash b/boot/lpc32xxcdl/lpc32xxcdl.hash deleted file mode 100644 index 8c6b73d63f..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc lpc32xx_cdl-v2.11.zip diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk deleted file mode 100644 index 9f5cd27f50..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl.mk +++ /dev/null @@ -1,71 +0,0 @@ -################################################################################ -# -# lpc32xxcdl -# -################################################################################ - -LPC32XXCDL_VERSION = 2.11 -LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip -LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2 - -LPC32XXCDL_INSTALL_TARGET = NO -LPC32XXCDL_INSTALL_IMAGES = YES - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"ea3250") -LPC32XXCDL_KICKSTART = kickstart/nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart -LPC32XXCDL_S1L = s1l -LPC32XXCDL_S1L_BURNER = nand/s1lapp -endif - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"phy3250") -LPC32XXCDL_KICKSTART = kickstart/kickstart_nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart -LPC32XXCDL_S1L = s1l/s1l_nand_boot -LPC32XXCDL_S1L_BURNER = nand/s1lapp -endif - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"fdi3250") -LPC32XXCDL_KICKSTART = kickstart/nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart_jtag -LPC32XXCDL_S1L = s1l -LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag -endif - -LPC32XXCDL_BUILD_FLAGS = \ - CROSS_COMPILE=$(TARGET_CROSS) \ - NXPMCU_WINBASE=$(@D) \ - NXPMCU_SOFTWARE=$(@D) \ - BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \ - CSP=lpc32xx TOOL=gnu GEN=lpc - -LPC32XXCDL_BOARD_STARTUP_DIR = \ - csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/ - -# Source files are with dos newlines, which our patch infrastructure doesn't -# handle. Work around it by converting the affected files to unix newlines -# before patching -define LPC32XXCDL_EXTRACT_CMDS - unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D) - mv $(@D)/lpc3xxx_cdl/* $(@D) - rmdir $(@D)/lpc3xxx_cdl/ - sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \ - boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//' -endef - -define LPC32XXCDL_BUILD_CMDS - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L) -endef - -define LPC32XXCDL_INSTALL_IMAGES_CMDS - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)/*gnu.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) diff --git a/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch new file mode 100644 index 0000000000..5a623f28f9 --- /dev/null +++ b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch @@ -0,0 +1,49 @@ +From 4796a1eacc6a5ccb623e7d2e46a5196f8335e496 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 11 Aug 2023 11:19:49 +0300 +Subject: [PATCH] Allow access to low addresses with gcc 12 + +gcc 12 added a warning that triggers on access to low addresses. Add a +compile option that allows access to lower addresses. + +Add the 'cc_option' macro to avoid the compile option when the compiler +does not support it. + +This fixes build with TF-A. TF-A added a similar fix in commit +dea23e245fb89. + +See some more details in +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 + +Upstream: https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/42 +Signed-off-by: Baruch Siach +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 3f0dd89a7381..045284c30cbc 100644 +--- a/Makefile ++++ b/Makefile +@@ -108,6 +108,10 @@ MV_DDR_VER_CSRC = mv_ddr_build_message.c + # create mv_ddr build message and version string source file + $(shell $(MV_DDR_ROOT)/scripts/localversion.sh $(MV_DDR_ROOT) $(MV_DDR_VER_CSRC) 2> /dev/null) + ++define cc_option ++ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ + # ****************** + # U-BOOT SPL SUPPORT + # ****************** +@@ -331,6 +335,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT) + CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 + CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc + CFLAGS += -march=armv8-a -fpie ++CFLAGS += $(call cc_option, --param=min-pagesize=0) + + # PLATFORM is set in ble/ble.mk + ifneq ($(findstring a80x0,$(PLATFORM)),) +-- +2.40.1 + diff --git a/boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch similarity index 80% rename from boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch rename to boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch index 62b1000727..626279eb47 100644 --- a/boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch +++ b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch @@ -10,25 +10,24 @@ routines. The mv-ddr-marvell Makefile provides no way to add custom CFLAGS. Patch Makefile to disable stack protection. +Upstream: not applicable; Buildroot specific Signed-off-by: Baruch Siach ---- -Upstream status: not applicable; Buildroot specific --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 3f0dd89a7381..feae75cc16e4 100644 +index 045284c30cbc..9641354bcf86 100644 --- a/Makefile +++ b/Makefile -@@ -331,6 +331,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT) - CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 +@@ -336,6 +336,7 @@ CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc CFLAGS += -march=armv8-a -fpie + CFLAGS += $(call cc_option, --param=min-pagesize=0) +CFLAGS += -fno-stack-protector # PLATFORM is set in ble/ble.mk ifneq ($(findstring a80x0,$(PLATFORM)),) -- -2.35.1 +2.40.1 diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index 3b62c3615f..21b2d01a9a 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -38,7 +38,6 @@ BR2_TARGET_UBOOT_NEEDS_OPENSBI=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index b4ea1b9112..ba2c79d4a7 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -17,15 +17,15 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -36,8 +36,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.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.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 ed9e13e6eb..d490ec3c46 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -16,15 +16,15 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=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.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.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 c4520aeb89..429d84c1d4 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -16,15 +16,15 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=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.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.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 dc9c1acf78..ea5f21cb3d 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-5.15.52-2.1.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" +# Latest revision of branch boundary-lf-6.1.22-2.0.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -40,7 +40,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-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,8 +51,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.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 f021a30ad8..5b7fb4a3bc 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-5.15.52-2.1.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" +# Latest revision of branch boundary-lf-6.1.22-2.0.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -40,7 +40,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-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,8 +51,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.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 88925cfda7..2fc9442d9e 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-5.15.52-2.1.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" +# Latest revision of branch boundary-lf-6.1.22-2.0.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -40,7 +40,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-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,8 +51,8 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.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 956c3b7bc1..c5f79c3913 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-5.15.52-2.1.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" +# Latest revision of branch boundary-lf-6.1.22-2.0.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -40,7 +40,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-v2022.04 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -51,10 +51,10 @@ BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.15.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz" +# Latest revision of branch boundary-imx_6.1.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen_smarc freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index bf62136345..d6dd8bd1b7 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" +BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 50b61a8007..a6444103c9 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" +BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 6e525d9676..eed656ef5f 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -5,6 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="" BR2_TARGET_GENERIC_HOSTNAME="rock5b" BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y diff --git a/docs/website/download.html b/docs/website/download.html index 3d5e2b37de..45d6bbeef3 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@ -

Latest release candidate: 2023.08-rc1

+

Latest release candidate: 2023.08-rc2

- +
- +
-

buildroot-2023.08-rc1.tar.gz

-

PGP signature

+

buildroot-2023.08-rc2.tar.gz

+

PGP signature

- +
- +
-

buildroot-2023.08-rc1.tar.xz

-

PGP signature

+

buildroot-2023.08-rc2.tar.xz

+

PGP signature

diff --git a/docs/website/news.html b/docs/website/news.html index a338b15acf..8c7cc8a8c2 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2023.08-rc2 released

    +

    20 August 2023

    +
    +
    +

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

    + +

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

    +
    +
    +
    • +
  • diff --git a/linux/Config.in b/linux/Config.in index 58cc9574a0..32940bc346 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.4.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.4.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 1236686384..40ace29532 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 de143cb61dcaa756c05f56ff35144316d810615819518a33e34754f064c4a7d8 linux-6.4.7.tar.xz -sha256 aaf8261b551c8b76b81eab8780b446e88cea4d551ae517ac3a9b2dbdbd381ed3 linux-6.1.42.tar.xz +sha256 b8b8a29852b999f337c4e93eff6c91fb7fd2d49a6614cbcbeb6fa171ba55cc9f linux-6.4.9.tar.xz +sha256 2e51d41fe11d082ae167cee05772bb07ca7f19448d2b46772d8ca2db7673a1a5 linux-6.1.44.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 linux-5.15.123.tar.xz -sha256 c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 linux-5.10.188.tar.xz -sha256 bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca linux-5.4.251.tar.xz +sha256 150f3846b76cd23a6135f49cef71372bade5a06e851cb4f8558df8b862d8fec7 linux-5.15.125.tar.xz +sha256 4c03516ae1d417571faaef175932d0892710bcbe0173e40550014d043d9098c9 linux-5.10.189.tar.xz +sha256 3a78587523940374a7319089b63357c7dc412b90f5879d512265e59173588267 linux-5.4.252.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 118f7411793868db8dcb043cdc82e9ac6f722fbec8dcdde30b07889d941aa3b3 linux-4.19.289.tar.xz -sha256 ed82679c0c6e600db80050d09e2294fb28b61cf27dc98657296c7eb5250a7625 linux-4.14.320.tar.xz +sha256 9fa5e24b7d791583f8cd001bcf02b52f569f261e276dc1dab2552974dca20ecf linux-4.19.290.tar.xz +sha256 d0e32bd47a547cc20e0ce09ff45514282742edb2af38df5dc0a03f22d4321715 linux-4.14.321.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index 64174a113d..bfc627fa91 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -9,6 +9,7 @@ AUBIO_SITE = https://aubio.org/pub AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 AUBIO_LICENSE = GPL-3.0+ AUBIO_LICENSE_FILES = COPYING +AUBIO_CPE_ID_VENDOR = aubio AUBIO_INSTALL_STAGING = YES AUBIO_DEPENDENCIES = host-pkgconf diff --git a/package/berkeleydb/Config.in b/package/berkeleydb/Config.in index f32d13ab17..f8fbb5cc09 100644 --- a/package/berkeleydb/Config.in +++ b/package/berkeleydb/Config.in @@ -13,6 +13,11 @@ config BR2_PACKAGE_BERKELEYDB_COMPAT185 help Build and install DB 1.85 compatibility API. +config BR2_PACKAGE_BERKELEYDB_DBM + bool "historic dbm interface" + help + Enable the historic dbm interface. + config BR2_PACKAGE_BERKELEYDB_TOOLS bool "install tools" help diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 36b1894f34..1c121370db 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -39,6 +39,7 @@ define BERKELEYDB_CONFIGURE_CMDS --disable-java \ --disable-tcl \ $(if $(BR2_PACKAGE_BERKELEYDB_COMPAT185),--enable-compat185,--disable-compat185) \ + $(if $(BR2_PACKAGE_BERKELEYDB_DBM),--enable-dbm,--disable-dbm) \ $(SHARED_STATIC_LIBS_OPTS) \ --with-pic \ --enable-o_direct \ diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index de09eafae5..bf3ed74afc 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -9,6 +9,7 @@ BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ BWM_NG_LICENSE_FILES = COPYING +BWM_NG_CPE_ID_VENDOR = bwm-ng_project BWM_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_NCURSES),y) diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch new file mode 100644 index 0000000000..42872597cd --- /dev/null +++ b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch @@ -0,0 +1,29 @@ +From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Tue, 1 Aug 2023 12:30:12 +0200 +Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 + +See also #1289. + +Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 + +Signed-off-by: Bernd Kuhls +--- + src/storage/local/LocalStorage.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp +index 3e5abe5074..d0a904e553 100644 +--- a/src/storage/local/LocalStorage.cpp ++++ b/src/storage/local/LocalStorage.cpp +@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, + auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); + l2_content_lock.make_long_lived(lock_manager); + if (!l2_content_lock.acquire()) { +- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); ++ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 ++ LOG_RAW(fmt::format( ++ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); + return; + } + diff --git a/package/check/check.hash b/package/check/check.hash index 543e78f317..9b380ddc28 100644 --- a/package/check/check.hash +++ b/package/check/check.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a check-0.15.2.tar.gz +sha256 998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e check-0.15.2.tar.gz # License files, locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER diff --git a/package/check/check.mk b/package/check/check.mk index d3977154df..0bdc9b93ef 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -5,7 +5,7 @@ ################################################################################ CHECK_VERSION = 0.15.2 -CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION) +CHECK_SITE = $(call github,libcheck,check,$(CHECK_VERSION)) CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk index 8318c123bd..581b2c51c2 100644 --- a/package/chocolate-doom/chocolate-doom.mk +++ b/package/chocolate-doom/chocolate-doom.mk @@ -8,6 +8,8 @@ CHOCOLATE_DOOM_VERSION = 3.0.1 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) CHOCOLATE_DOOM_LICENSE = GPL-2.0+ CHOCOLATE_DOOM_LICENSE_FILES = COPYING +CHOCOLATE_DOOM_CPE_ID_VENDOR = chocolate-doom +CHOCOLATE_DOOM_CPE_ID_PRODUCT = chocolate_doom CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net # Avoid installing desktop entries, icons, etc. diff --git a/package/composer/composer.mk b/package/composer/composer.mk index a24c020796..9bfabc28af 100644 --- a/package/composer/composer.mk +++ b/package/composer/composer.mk @@ -13,8 +13,10 @@ BASE_SITE = https://getcomposer.org/download/$(COMPOSER_VERSION)/composer.phar COMPOSER_SITE = $(BASE_SITE)?n=f/$(COMPOSER_SOURCE) COMPOSER_LICENSE = MIT COMPOSER_LICENSE_FILES = LICENSE +COMPOSER_CPE_ID_VENDOR = getcomposer HOST_COMPOSER_DEPENDENCIES = host-php +HOST_COMPOSER_EXTRACT_DEPENDENCIES = host-php define HOST_COMPOSER_EXTRACT_CMDS cp $(HOST_COMPOSER_DL_DIR)/$(COMPOSER_SOURCE) $(@D) diff --git a/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch b/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch new file mode 100644 index 0000000000..14f817942e --- /dev/null +++ b/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch @@ -0,0 +1,26 @@ +From e28634a0e847a14c58482f962bc9b1d69937387f Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 12 Aug 2023 12:53:37 +0200 +Subject: [PATCH] remove unused dlfcn.h header file + +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/containers/conmon/issues/443 +--- + src/seccomp_notify.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/seccomp_notify.c b/src/seccomp_notify.c +index 8d34d9d..2a8371d 100644 +--- a/src/seccomp_notify.c ++++ b/src/seccomp_notify.c +@@ -7,7 +7,6 @@ + + #include + #include +-#include + #include + #include + #include +-- +2.39.2 + diff --git a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch deleted file mode 100644 index d1a9d8f8fe..0000000000 --- a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d1a5ede5d255bde8ef707f8441b997563b9312bd Mon Sep 17 00:00:00 2001 -From: Nathan Crandall -Date: Tue, 12 Jul 2022 08:56:34 +0200 -Subject: gweb: Fix OOB write in received_data() - -There is a mismatch of handling binary vs. C-string data with memchr -and strlen, resulting in pos, count, and bytes_read to become out of -sync and result in a heap overflow. Instead, do not treat the buffer -as an ASCII C-string. We calculate the count based on the return value -of memchr, instead of strlen. - -Fixes: CVE-2022-32292 - -[Retrieved from: -https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d1a5ede5d255bde8ef707f8441b997563b9312bd] -Signed-off-by: Fabrice Fontaine ---- - gweb/gweb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gweb/gweb.c b/gweb/gweb.c -index 12fcb1d8..13c6c5f2 100644 ---- a/gweb/gweb.c -+++ b/gweb/gweb.c -@@ -918,7 +918,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond, - } - - *pos = '\0'; -- count = strlen((char *) ptr); -+ count = pos - ptr; - if (count > 0 && ptr[count - 1] == '\r') { - ptr[--count] = '\0'; - bytes_read--; --- -cgit - diff --git a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch deleted file mode 100644 index c2cebdfdcc..0000000000 --- a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 72343929836de80727a27d6744c869dff045757c Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Tue, 5 Jul 2022 08:32:12 +0200 -Subject: wispr: Add reference counter to portal context - -Track the connman_wispr_portal_context live time via a -refcounter. This only adds the infrastructure to do proper reference -counting. - -Fixes: CVE-2022-32293 - -[Retrieved from: -https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=72343929836de80727a27d6744c869dff045757c] -Signed-off-by: Fabrice Fontaine ---- - src/wispr.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 42 insertions(+), 10 deletions(-) - -diff --git a/src/wispr.c b/src/wispr.c -index a07896ca..bde7e63b 100644 ---- a/src/wispr.c -+++ b/src/wispr.c -@@ -56,6 +56,7 @@ struct wispr_route { - }; - - struct connman_wispr_portal_context { -+ int refcount; - struct connman_service *service; - enum connman_ipconfig_type type; - struct connman_wispr_portal *wispr_portal; -@@ -97,6 +98,11 @@ static char *online_check_ipv4_url = NULL; - static char *online_check_ipv6_url = NULL; - static bool enable_online_to_ready_transition = false; - -+#define wispr_portal_context_ref(wp_context) \ -+ wispr_portal_context_ref_debug(wp_context, __FILE__, __LINE__, __func__) -+#define wispr_portal_context_unref(wp_context) \ -+ wispr_portal_context_unref_debug(wp_context, __FILE__, __LINE__, __func__) -+ - static void connman_wispr_message_init(struct connman_wispr_message *msg) - { - DBG(""); -@@ -162,9 +168,6 @@ static void free_connman_wispr_portal_context( - { - DBG("context %p", wp_context); - -- if (!wp_context) -- return; -- - if (wp_context->wispr_portal) { - if (wp_context->wispr_portal->ipv4_context == wp_context) - wp_context->wispr_portal->ipv4_context = NULL; -@@ -201,9 +204,38 @@ static void free_connman_wispr_portal_context( - g_free(wp_context); - } - -+static struct connman_wispr_portal_context * -+wispr_portal_context_ref_debug(struct connman_wispr_portal_context *wp_context, -+ const char *file, int line, const char *caller) -+{ -+ DBG("%p ref %d by %s:%d:%s()", wp_context, -+ wp_context->refcount + 1, file, line, caller); -+ -+ __sync_fetch_and_add(&wp_context->refcount, 1); -+ -+ return wp_context; -+} -+ -+static void wispr_portal_context_unref_debug( -+ struct connman_wispr_portal_context *wp_context, -+ const char *file, int line, const char *caller) -+{ -+ if (!wp_context) -+ return; -+ -+ DBG("%p ref %d by %s:%d:%s()", wp_context, -+ wp_context->refcount - 1, file, line, caller); -+ -+ if (__sync_fetch_and_sub(&wp_context->refcount, 1) != 1) -+ return; -+ -+ free_connman_wispr_portal_context(wp_context); -+} -+ - static struct connman_wispr_portal_context *create_wispr_portal_context(void) - { -- return g_try_new0(struct connman_wispr_portal_context, 1); -+ return wispr_portal_context_ref( -+ g_new0(struct connman_wispr_portal_context, 1)); - } - - static void free_connman_wispr_portal(gpointer data) -@@ -215,8 +247,8 @@ static void free_connman_wispr_portal(gpointer data) - if (!wispr_portal) - return; - -- free_connman_wispr_portal_context(wispr_portal->ipv4_context); -- free_connman_wispr_portal_context(wispr_portal->ipv6_context); -+ wispr_portal_context_unref(wispr_portal->ipv4_context); -+ wispr_portal_context_unref(wispr_portal->ipv6_context); - - g_free(wispr_portal); - } -@@ -452,7 +484,7 @@ static void portal_manage_status(GWebResult *result, - connman_info("Client-Timezone: %s", str); - - if (!enable_online_to_ready_transition) -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_ONLINE, type); -@@ -616,7 +648,7 @@ static void wispr_portal_request_wispr_login(struct connman_service *service, - return; - } - -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - return; - } - -@@ -952,7 +984,7 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) - - if (wp_context->token == 0) { - err = -EINVAL; -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - } - } else if (wp_context->timeout == 0) { - wp_context->timeout = g_idle_add(no_proxy_callback, wp_context); -@@ -1001,7 +1033,7 @@ int __connman_wispr_start(struct connman_service *service, - - /* If there is already an existing context, we wipe it */ - if (wp_context) -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - - wp_context = create_wispr_portal_context(); - if (!wp_context) --- -cgit - diff --git a/package/connman/0003-wispr-Update-portal-context-references.patch b/package/connman/0003-wispr-Update-portal-context-references.patch deleted file mode 100644 index 61c4e21f94..0000000000 --- a/package/connman/0003-wispr-Update-portal-context-references.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 416bfaff988882c553c672e5bfc2d4f648d29e8a Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Tue, 5 Jul 2022 09:11:09 +0200 -Subject: wispr: Update portal context references - -Maintain proper portal context references to avoid UAF. - -Fixes: CVE-2022-32293 - -[Retrieved from: -https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=416bfaff988882c553c672e5bfc2d4f648d29e8a] -Signed-off-by: Fabrice Fontaine ---- - src/wispr.c | 34 ++++++++++++++++++++++------------ - 1 file changed, 22 insertions(+), 12 deletions(-) - -diff --git a/src/wispr.c b/src/wispr.c -index bde7e63b..84bed33f 100644 ---- a/src/wispr.c -+++ b/src/wispr.c -@@ -105,8 +105,6 @@ static bool enable_online_to_ready_transition = false; - - static void connman_wispr_message_init(struct connman_wispr_message *msg) - { -- DBG(""); -- - msg->has_error = false; - msg->current_element = NULL; - -@@ -166,8 +164,6 @@ static void free_wispr_routes(struct connman_wispr_portal_context *wp_context) - static void free_connman_wispr_portal_context( - struct connman_wispr_portal_context *wp_context) - { -- DBG("context %p", wp_context); -- - if (wp_context->wispr_portal) { - if (wp_context->wispr_portal->ipv4_context == wp_context) - wp_context->wispr_portal->ipv4_context = NULL; -@@ -483,9 +479,6 @@ static void portal_manage_status(GWebResult *result, - &str)) - connman_info("Client-Timezone: %s", str); - -- if (!enable_online_to_ready_transition) -- wispr_portal_context_unref(wp_context); -- - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_ONLINE, type); - -@@ -546,14 +539,17 @@ static void wispr_portal_request_portal( - { - DBG(""); - -+ wispr_portal_context_ref(wp_context); - wp_context->request_id = g_web_request_get(wp_context->web, - wp_context->status_url, - wispr_portal_web_result, - wispr_route_request, - wp_context); - -- if (wp_context->request_id == 0) -+ if (wp_context->request_id == 0) { - wispr_portal_error(wp_context); -+ wispr_portal_context_unref(wp_context); -+ } - } - - static bool wispr_input(const guint8 **data, gsize *length, -@@ -618,13 +614,15 @@ static void wispr_portal_browser_reply_cb(struct connman_service *service, - return; - - if (!authentication_done) { -- wispr_portal_error(wp_context); - free_wispr_routes(wp_context); -+ wispr_portal_error(wp_context); -+ wispr_portal_context_unref(wp_context); - return; - } - - /* Restarting the test */ - __connman_service_wispr_start(service, wp_context->type); -+ wispr_portal_context_unref(wp_context); - } - - static void wispr_portal_request_wispr_login(struct connman_service *service, -@@ -700,11 +698,13 @@ static bool wispr_manage_message(GWebResult *result, - - wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN; - -+ wispr_portal_context_ref(wp_context); - if (__connman_agent_request_login_input(wp_context->service, - wispr_portal_request_wispr_login, -- wp_context) != -EINPROGRESS) -+ wp_context) != -EINPROGRESS) { - wispr_portal_error(wp_context); -- else -+ wispr_portal_context_unref(wp_context); -+ } else - return true; - - break; -@@ -753,6 +753,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - if (length > 0) { - g_web_parser_feed_data(wp_context->wispr_parser, - chunk, length); -+ wispr_portal_context_unref(wp_context); - return true; - } - -@@ -770,6 +771,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - switch (status) { - case 000: -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -781,11 +783,14 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - if (g_web_result_get_header(result, "X-ConnMan-Status", - &str)) { - portal_manage_status(result, wp_context); -+ wispr_portal_context_unref(wp_context); - return false; -- } else -+ } else { -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->redirect_url, wp_context); -+ } - - break; - case 300: -@@ -798,6 +803,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - !g_web_result_get_header(result, "Location", - &redirect)) { - -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -808,6 +814,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - wp_context->redirect_url = g_strdup(redirect); - -+ wispr_portal_context_ref(wp_context); - wp_context->request_id = g_web_request_get(wp_context->web, - redirect, wispr_portal_web_result, - wispr_route_request, wp_context); -@@ -820,6 +827,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - break; - case 505: -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -832,6 +840,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - wp_context->request_id = 0; - done: - wp_context->wispr_msg.message_type = -1; -+ wispr_portal_context_unref(wp_context); - return false; - } - -@@ -890,6 +899,7 @@ static void proxy_callback(const char *proxy, void *user_data) - xml_wispr_parser_callback, wp_context); - - wispr_portal_request_portal(wp_context); -+ wispr_portal_context_unref(wp_context); - } - - static gboolean no_proxy_callback(gpointer user_data) --- -cgit - diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 6fc5edf29a..ea87f1ea17 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz +sha256 a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa connman-1.42.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index fbd7318e4e..142a6583ad 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.41 +CONNMAN_VERSION = 1.42 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus @@ -13,13 +13,6 @@ CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING CONNMAN_CPE_ID_VENDOR = intel -# 0001-gweb-Fix-OOB-write-in-received_data.patch -CONNMAN_IGNORE_CVES += CVE-2022-32292 - -# 0002-wispr-Add-reference-counter-to-portal-context.patch -# 0003-wispr-Update-portal-context-references.patch -CONNMAN_IGNORE_CVES += CVE-2022-32293 - CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc ifeq ($(BR2_INIT_SYSTEMD),y) diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 670a81d1c8..e90f53dc1a 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -9,6 +9,7 @@ DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING +DAV1D_CPE_ID_VENDOR = videolan DAV1D_INSTALL_STAGING = YES DAV1D_CONF_OPTS = \ -Denable_tests=false \ diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 2c66434a9a..1119266863 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -10,6 +10,7 @@ DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) DIFFUTILS_LICENSE = GPL-3.0+ DIFFUTILS_LICENSE_FILES = COPYING +DIFFUTILS_CPE_ID_VENDOR = gnu # Since glibc >= 2.26, don't try to use getopt_long replacement bundled # with diffutils. It will conflict with the one from glibc. diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 597492bc5e..3eb9bcc474 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -8,6 +8,7 @@ DRACUT_VERSION = 057 DRACUT_SITE = $(call github,dracutdevs,dracut,$(DRACUT_VERSION)) DRACUT_LICENSE = GPL-2.0 DRACUT_LICENSE_FILES = COPYING +DRACUT_CPE_ID_VENDOR = dracut_project HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 75214be8c7..80090621bf 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -70,6 +70,11 @@ ifeq ($(BR2_nios2),y) E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no endif +# workaround gcc bug 111001 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_111001),y) +E2FSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Os" +endif + E2FSPROGS_CONF_ENV += ac_cv_path_LDCONFIG=true HOST_E2FSPROGS_CONF_ENV += ac_cv_path_LDCONFIG=true diff --git a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch index 4aa473c244..f9e493a761 100644 --- a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch +++ b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch @@ -1,4 +1,4 @@ -From d78acba6510527aaa01a41eaf4c931f7a57e5f44 Mon Sep 17 00:00:00 2001 +From 2821fcb55cbe0f2b77237d89b5b3467fb3ad058b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 5 Feb 2020 10:31:32 +0100 Subject: [PATCH] elf2flt: handle binutils >= 2.34 @@ -373,5 +373,5 @@ index 7ac0617..ea6b5a1 100644 fatal("read error section %s", s->name); } -- -2.35.1 +2.41.0 diff --git a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch index 4df3ea5929..8bd0383683 100644 --- a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch +++ b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch @@ -1,4 +1,4 @@ -From 85ba5664eb368eb1cbd2c30b7cd574acd75edd4c Mon Sep 17 00:00:00 2001 +From 37b281e4dd0fb5832181e51943a4eb3c74d4f618 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Mon, 4 Apr 2022 15:30:24 +0200 Subject: [PATCH] elf2flt.ld: reinstate 32 byte alignment for .data section @@ -77,5 +77,5 @@ index 0df999d..e5aea14 100644 @SYMBOL_PREFIX@__data_start = . ; @SYMBOL_PREFIX@data_start = . ; -- -2.35.1 +2.41.0 diff --git a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch index 15c191c83d..c2aa538d02 100644 --- a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch +++ b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch @@ -1,4 +1,4 @@ -From 3f1f323feb5cf25d8c80861991d0360784f4d2e6 Mon Sep 17 00:00:00 2001 +From 1498503bde2a6055a83f1e9f3eaa6f2a104bd597 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Wed, 9 Sep 2020 17:31:33 +0900 Subject: [PATCH] elf2flt: add riscv 64-bits support @@ -27,7 +27,7 @@ Signed-off-by: Damien Le Moal 3 files changed, 25 insertions(+) diff --git a/elf2flt.c b/elf2flt.c -index da25e93..a03ea3a 100644 +index ea6b5a1..c2816b6 100644 --- a/elf2flt.c +++ b/elf2flt.c @@ -81,6 +81,8 @@ const char *elf2flt_progname; @@ -48,7 +48,7 @@ index da25e93..a03ea3a 100644 #else #error "Don't know how to support your CPU architecture??" #endif -@@ -812,6 +816,18 @@ output_relocs ( +@@ -821,6 +825,18 @@ output_relocs ( goto good_32bit_resolved_reloc; default: goto bad_resolved_reloc; @@ -99,5 +99,5 @@ index 7cb02d5..75ee1bb 100644 if (!linker_script) linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL); -- -2.36.1 +2.41.0 diff --git a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch index 6fee99d45a..be8d57affa 100644 --- a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch +++ b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch @@ -1,4 +1,4 @@ -From 37e1e0ace8ccebf54ec2f5522bfc1f9db86946ad Mon Sep 17 00:00:00 2001 +From 4f28e4329897b7f23d828b375fb365d0e30c9cb5 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 12:13:50 +0200 Subject: [PATCH] elf2flt: create a common helper function @@ -14,10 +14,10 @@ Signed-off-by: Niklas Cassel 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 669591e..9c32f9a 100644 +index c2816b6..8cd48d9 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -337,6 +337,13 @@ compare_relocs (const void *pa, const void *pb) +@@ -346,6 +346,13 @@ compare_relocs (const void *pa, const void *pb) } #endif @@ -31,7 +31,7 @@ index 669591e..9c32f9a 100644 static uint32_t * output_relocs ( bfd *abs_bfd, -@@ -428,8 +435,7 @@ output_relocs ( +@@ -437,8 +444,7 @@ output_relocs ( */ if ((!pic_with_got || ALWAYS_RELOC_TEXT) && ((a->flags & SEC_CODE) || @@ -41,7 +41,7 @@ index 669591e..9c32f9a 100644 sectionp = text + (a->vma - text_vma); else if (a->flags & SEC_DATA) sectionp = data + (a->vma - data_vma); -@@ -1893,8 +1899,7 @@ int main(int argc, char *argv[]) +@@ -1902,8 +1908,7 @@ int main(int argc, char *argv[]) bfd_vma sec_vma; if ((s->flags & SEC_CODE) || @@ -51,7 +51,7 @@ index 669591e..9c32f9a 100644 vma = &text_vma; len = &text_len; } else if (s->flags & SEC_DATA) { -@@ -1932,8 +1937,7 @@ int main(int argc, char *argv[]) +@@ -1941,8 +1946,7 @@ int main(int argc, char *argv[]) * data sections.*/ for (s = abs_bfd->sections; s != NULL; s = s->next) if ((s->flags & SEC_CODE) || @@ -60,8 +60,8 @@ index 669591e..9c32f9a 100644 + ro_reloc_data_section_should_be_in_text(s)) if (!bfd_get_section_contents(abs_bfd, s, text + (s->vma - text_vma), 0, - bfd_section_size(abs_bfd, s))) -@@ -1962,8 +1966,7 @@ int main(int argc, char *argv[]) + elf2flt_bfd_section_size(s))) +@@ -1971,8 +1975,7 @@ int main(int argc, char *argv[]) * data sections already included in the text output section.*/ for (s = abs_bfd->sections; s != NULL; s = s->next) if ((s->flags & SEC_DATA) && @@ -70,7 +70,7 @@ index 669591e..9c32f9a 100644 + !ro_reloc_data_section_should_be_in_text(s)) if (!bfd_get_section_contents(abs_bfd, s, data + (s->vma - data_vma), 0, - bfd_section_size(abs_bfd, s))) + elf2flt_bfd_section_size(s))) -- -2.37.1 +2.41.0 diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 616bbc891f..96befd53d8 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,4 +1,4 @@ -From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 +From 87d45736a6855f2147ef9c88d2bce2cabc84cb52 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 @@ -50,10 +50,10 @@ Signed-off-by: Niklas Cassel 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index e0d7891..39d035f 100644 +index 8cd48d9..60bfa57 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) +@@ -349,8 +349,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -70,5 +70,5 @@ index e0d7891..39d035f 100644 static uint32_t * -- -2.39.0 +2.41.0 diff --git a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch b/package/elf2flt/0006-xtensa-fix-text-relocations.patch similarity index 88% rename from package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch rename to package/elf2flt/0006-xtensa-fix-text-relocations.patch index 3664775906..19c47cca90 100644 --- a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch +++ b/package/elf2flt/0006-xtensa-fix-text-relocations.patch @@ -1,4 +1,4 @@ -From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From 7e1c17d7fe72a0889d56d5e6a1390d493d1de144 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 29 Nov 2022 17:47:54 -0800 Subject: [PATCH] xtensa: fix text relocations @@ -21,10 +21,10 @@ Signed-off-by: Max Filippov 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/elf2flt.c b/elf2flt.c -index b93aecdaced3..cec3f4a22239 100644 +index 60bfa57..0fcb747 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -808,7 +808,20 @@ output_relocs ( +@@ -833,7 +833,20 @@ output_relocs ( continue; case R_XTENSA_32: case R_XTENSA_PLT: @@ -45,7 +45,7 @@ index b93aecdaced3..cec3f4a22239 100644 + break; default: goto bad_resolved_reloc; - #else + #elif defined(TARGET_riscv64) -- -2.30.2 +2.41.0 diff --git a/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch b/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch new file mode 100644 index 0000000000..82e693f35f --- /dev/null +++ b/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch @@ -0,0 +1,169 @@ +From 9ec7dd9dead2f3c4c73c3ab2166a1f81bfb41825 Mon Sep 17 00:00:00 2001 +From: Greg Ungerer +Date: Thu, 13 Apr 2023 22:58:20 +1000 +Subject: [PATCH] elf2flt: remove use of BFD_VMA_FMT + +In binutils-2.40 the BFD_VMA_FMT definition used for printf style +formatting specifiers has been removed. For reference this was done in +commit b82817674f46 ("Don't use BFD_VMA_FMT in binutils") in the +binutils git development tree. + +BFD_VMA_FMT is used in a number of places in the elf2flt code to output +bfd offsets, values and the like. So it is broken when using the bfd +code from binutils-2.40 and newer. + +According to the binutils change PRIx64 (and friends) is used to replace +it, with appropriate casts to keep it clean for 32 and 64 bit platforms. +Change the elf2flt.c use of it in the same way to fix. + +This does not change the output in any way in normal use. This fix can +be used on all versions of binutils (older and newer), there is no +need to only do this on 2.40 and newer. + +Signed-off-by: Greg Ungerer +Upstream: https://github.com/uclinux-dev/elf2flt/commit/a36df7407d9e3f93ca6449841ff0821b0d980438 +Signed-off-by: Thomas Petazzoni +--- + elf2flt.c | 58 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 30 insertions(+), 28 deletions(-) + +diff --git a/elf2flt.c b/elf2flt.c +index 0fcb747..6685bff 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -220,8 +220,8 @@ dump_symbols(asymbol **symbol_table, long number_of_symbols) + long i; + printf("SYMBOL TABLE:\n"); + for (i=0; iname, symbol_table[i]->value); ++ printf(" NAME=%s VALUE=0x%"PRIx64"\n", ++ symbol_table[i]->name, (uint64_t) symbol_table[i]->value); + } + printf("\n"); + return(0); +@@ -466,8 +466,8 @@ output_relocs ( + if (r == NULL) + continue; + if (verbose) +- printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", +- r->name, r, r->flags, elf2flt_bfd_section_vma(r)); ++ printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"PRIx64"\n", ++ r->name, r, r->flags, (uint64_t) elf2flt_bfd_section_vma(r)); + if ((r->flags & SEC_RELOC) == 0) + continue; + relsize = bfd_get_reloc_upper_bound(rel_bfd, r); +@@ -952,12 +952,13 @@ output_relocs ( + if (verbose) + fprintf(stderr, + "%s vma=0x%x, " +- "value=0x%"BFD_VMA_FMT"x, " +- "address=0x%"BFD_VMA_FMT"x " ++ "value=0x%"PRIx64", " ++ "address=0x%"PRIx64" " + "sym_addr=0x%x rs=0x%x, opcode=0x%x\n", + "ABS32", +- sym_vma, (*(q->sym_ptr_ptr))->value, +- q->address, sym_addr, ++ sym_vma, ++ (uint64_t) (*(q->sym_ptr_ptr))->value, ++ (uint64_t) q->address, sym_addr, + (*p)->howto->rightshift, + *(uint32_t *)r_mem); + sym_vma = elf2flt_bfd_section_vma(sym_section); +@@ -971,12 +972,13 @@ output_relocs ( + if (verbose) + fprintf(stderr, + "%s vma=0x%x, " +- "value=0x%"BFD_VMA_FMT"x, " +- "address=0x%"BFD_VMA_FMT"x " ++ "value=0x%"PRIx64", " ++ "address=0x%"PRIx64" " + "sym_addr=0x%x rs=0x%x, opcode=0x%x\n", + "PLT32", +- sym_vma, (*(q->sym_ptr_ptr))->value, +- q->address, sym_addr, ++ sym_vma, ++ (uint64_t) (*(q->sym_ptr_ptr))->value, ++ (uint64_t) q->address, sym_addr, + (*p)->howto->rightshift, + *(uint32_t *)r_mem); + case R_ARM_PC24: +@@ -994,8 +996,8 @@ output_relocs ( + case R_V850_ZDA_16_16_OFFSET: + case R_V850_ZDA_16_16_SPLIT_OFFSET: + /* Can't support zero-relocations. */ +- printf ("ERROR: %s+0x%"BFD_VMA_FMT"x: zero relocations not supported\n", +- sym_name, q->addend); ++ printf ("ERROR: %s+0x%"PRIx64": zero relocations not supported\n", ++ sym_name, (uint64_t) q->addend); + continue; + #endif /* TARGET_v850 */ + +@@ -1194,12 +1196,12 @@ output_relocs ( + temp |= (exist_val & 0x3f); + *(unsigned long *)r_mem = htoniosl(temp); + if (verbose) +- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf("omit: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d " +- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) GPREL\n", +- q->address, sym_name, addstr, ++ "fixup=0x%x (reloc=0x%"PRIx64") GPREL\n", ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size, +- sym_addr, section_vma + q->address); ++ sym_addr, (uint64_t) section_vma + q->address); + continue; + } + case R_NIOS2_PCREL16: +@@ -1214,12 +1216,12 @@ output_relocs ( + exist_val |= ((sym_addr & 0xFFFF) << 6); + *(unsigned long *)r_mem = htoniosl(exist_val); + if (verbose) +- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf("omit: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d " +- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) PCREL\n", +- q->address, sym_name, addstr, ++ "fixup=0x%x (reloc=0x%"PRIx64") PCREL\n", ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size, +- sym_addr, section_vma + q->address); ++ sym_addr, (uint64_t) section_vma + q->address); + continue; + } + +@@ -1231,9 +1233,9 @@ output_relocs ( + && (p[-1]->sym_ptr_ptr == p[0]->sym_ptr_ptr) + && (p[-1]->addend == p[0]->addend)) { + if (verbose) +- printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf("omit: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d LO16\n", +- q->address, sym_name, addstr, ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size); + continue; + } +@@ -1646,13 +1648,13 @@ DIS29_RELOCATION: + */ + if (relocation_needed) { + if (verbose) +- printf(" RELOC[%d]: offset=0x%"BFD_VMA_FMT"x symbol=%s%s " ++ printf(" RELOC[%d]: offset=0x%"PRIx64" symbol=%s%s " + "section=%s size=%d " +- "fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x)\n", ++ "fixup=0x%x (reloc=0x%"PRIx64")\n", + flat_reloc_count, +- q->address, sym_name, addstr, ++ (uint64_t) q->address, sym_name, addstr, + section_name, sym_reloc_size, +- sym_addr, section_vma + q->address); ++ sym_addr, (uint64_t) section_vma + q->address); + + #ifndef TARGET_bfin + flat_relocs = realloc(flat_relocs, +-- +2.41.0 + diff --git a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch new file mode 100644 index 0000000000..74d3085d08 --- /dev/null +++ b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch @@ -0,0 +1,40 @@ +From 5acfed0012f2fff9801b25403bd8a5e1c2ccfea2 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 7 Aug 2023 09:30:34 +0200 +Subject: [PATCH] riscv64: add more relocations required to be handled + +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/uclinux-dev/elf2flt/pull/24 +--- + elf2flt.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/elf2flt.c b/elf2flt.c +index 6685bff..6b3bea4 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -850,11 +850,21 @@ output_relocs ( + default: + goto bad_resolved_reloc; + #elif defined(TARGET_riscv64) ++ case R_RISCV_NONE: + case R_RISCV_32_PCREL: ++ case R_RISCV_ADD8: ++ case R_RISCV_ADD16: + case R_RISCV_ADD32: + case R_RISCV_ADD64: ++ case R_RISCV_SUB6: ++ case R_RISCV_SUB8: ++ case R_RISCV_SUB16: + case R_RISCV_SUB32: + case R_RISCV_SUB64: ++ case R_RISCV_SET6: ++ case R_RISCV_SET8: ++ case R_RISCV_SET16: ++ case R_RISCV_SET32: + continue; + case R_RISCV_32: + case R_RISCV_64: +-- +2.39.2 + diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 6cd0786c3d..b970de48f2 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -14,12 +14,27 @@ HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib # 0001-elf2flt-handle-binutils-2.34.patch HOST_ELF2FLT_AUTORECONF = YES +# elf2flt needs to link against libbfd.a and libiberty.a which are +# provided by host-binutils, but not installed, so we poke directly +# into the host-binutils build directory. Turns out that the location +# of libbfd.a has changed in binutils >= 2.41, so we special case +# binutils 2.39 and 2.40, which are the two remaining versions still +# using the "old" path". Note: the ARC-special binutils version is not +# considered because Buildroot only supports ARC CPUs with a MMU and +# therefore host-elf2flt is never used on ARC. libiberty.a has +# remained at the same location. +ifeq ($(BR2_BINUTILS_VERSION_2_39_X)$(BR2_BINUTILS_VERSION_2_40_X),y) +HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/libbfd.a +else +HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/.libs/libbfd.a +endif + # It is not exactly a host variant, but more a cross variant, which is # why we pass a special --target option. HOST_ELF2FLT_CONF_OPTS = \ --with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \ --with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \ - --with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \ + --with-libbfd=$(HOST_ELF2FLT_LIBBFD_PATH) \ --with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \ --target=$(GNU_TARGET_NAME) \ --disable-werror diff --git a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch new file mode 100644 index 0000000000..abbc64a434 --- /dev/null +++ b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch @@ -0,0 +1,33 @@ +From 56920e3ce04aa2eadb529a6787200789bf1c3925 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Aug 2023 23:16:52 +0200 +Subject: [PATCH] esp_hosted_ng: host: fix build failure when CONFIG_PM is not + defined + +wiphy->wowlan is not defined when CONFIG_PM is not enabled so let's +guard the assignment to wiphy->wowlan according to option CONFIG_PM. + +Upstream: https://github.com/espressif/esp-hosted/pull/254 + +Signed-off-by: Giulio Benetti +--- + esp_hosted_ng/host/esp_cfg80211.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c +index 70fdbb9773..d3c4108c29 100644 +--- a/esp_hosted_ng/host/esp_cfg80211.c ++++ b/esp_hosted_ng/host/esp_cfg80211.c +@@ -638,7 +638,9 @@ int esp_cfg80211_register(struct esp_adapter *adapter) + wiphy->max_scan_ie_len = 1000; + wiphy->max_sched_scan_ssids = 10; + wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; ++#ifdef CONFIG_PM + wiphy->wowlan = &esp_wowlan_support; ++#endif + + /* Advertise SAE support */ + wiphy->features |= NL80211_FEATURE_SAE; +-- +2.34.1 + diff --git a/package/flite/flite.mk b/package/flite/flite.mk index 79b2288fe3..bee4c7394f 100644 --- a/package/flite/flite.mk +++ b/package/flite/flite.mk @@ -8,6 +8,7 @@ FLITE_VERSION = 2.2 FLITE_SITE = $(call github,festvox,flite,v$(FLITE_VERSION)) FLITE_LICENSE = BSD-4-Clause FLITE_LICENSE_FILES = COPYING +FLITE_CPE_ID_VENDOR = cmu FLITE_INSTALL_STAGING = YES # Patching configure.in diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 30403d5a31..4929784f96 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -154,6 +154,14 @@ ifeq ($(BR2_mips)$(BR2_mipsel):$(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y:y) HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer endif +# libsanitizer is broken for Thumb1, sanitizer_linux.cc contains unconditional +# "ldr ip, [sp], #8", which causes: +# ....s: Assembler messages: +# ....s:4190: Error: lo register required -- `ldr ip,[sp],#8' +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer +endif + # The logic in libbacktrace/configure.ac to detect if __sync builtins # are available assumes they are as soon as target_subdir is not # empty, i.e when cross-compiling. However, some platforms do not have diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index ec4cc24137..0d41548ed0 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -134,7 +134,8 @@ GDB_CONF_OPTS = \ --with-system-zlib \ --disable-werror \ --enable-static \ - --without-mpfr + --without-mpfr \ + --disable-source-highlight ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) GDB_CONF_OPTS += \ @@ -254,6 +255,7 @@ HOST_GDB_CONF_OPTS = \ --with-system-zlib \ --with-curses \ --without-mpfr \ + --disable-source-highlight \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash index 874737ea2d..6d4c718a40 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f go1.19.10.src.tar.gz +sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk index 477c24299c..72f3200a2e 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -6,7 +6,7 @@ # Use last Go version that go-bootstrap-stage1 can build: v1.19.x # See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_STAGE2_VERSION = 1.19.10 +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11 GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 3f12b71191..64c50dd6f7 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 58f3321dcf900175d87d5b39455138c2a24e69df4ba997fb44e3e0d19e531ad1 intel-microcode-20230512.tar.gz +sha256 fe49bb719441f20335ed6004090ab38cdc374134d36d4f5d30be7ed93b820313 intel-microcode-20230808.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 48c6340af8..0a89d3a603 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20230512 +INTEL_MICROCODE_VERSION = 20230808 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license diff --git a/package/kodi-imagedecoder-heif/0001-include-missing-cstdint-to-support-gcc-13.patch b/package/kodi-imagedecoder-heif/0001-include-missing-cstdint-to-support-gcc-13.patch new file mode 100644 index 0000000000..bd431545e1 --- /dev/null +++ b/package/kodi-imagedecoder-heif/0001-include-missing-cstdint-to-support-gcc-13.patch @@ -0,0 +1,31 @@ +From 47dcb3843e02abb69c52d6f0021bd2816b8317a5 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Thu, 27 Apr 2023 02:46:59 +1000 +Subject: [PATCH] include missing to support gcc-13 + +gcc 13 moved some includes around and as a result is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Rudi Heitbaum + +Upstream: https://github.com/xbmc/imagedecoder.heif/commit/47dcb3843e02abb69c52d6f0021bd2816b8317a5 + +Signed-off-by: Bernd Kuhls +--- + lib/TinyEXIF/TinyEXIF.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/TinyEXIF/TinyEXIF.h b/lib/TinyEXIF/TinyEXIF.h +index 56354aa..b03d36b 100644 +--- a/lib/TinyEXIF/TinyEXIF.h ++++ b/lib/TinyEXIF/TinyEXIF.h +@@ -34,6 +34,7 @@ + #ifndef __TINYEXIF_H__ + #define __TINYEXIF_H__ + ++#include + #include + #include + diff --git a/package/kodi-imagedecoder-heif/Config.in b/package/kodi-imagedecoder-heif/Config.in index 7cf2d1ef6e..d0950385a0 100644 --- a/package/kodi-imagedecoder-heif/Config.in +++ b/package/kodi-imagedecoder-heif/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF bool "kodi-imagedecoder-heif" depends on BR2_INSTALL_LIBSTDCPP # libde265, libheif, tinyxml2 depends on BR2_TOOLCHAIN_HAS_THREADS # libde265 - depends on !BR2_m68k_cf # libheif + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libheif select BR2_PACKAGE_LIBDE265 select BR2_PACKAGE_LIBHEIF @@ -13,6 +13,6 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF https://github.com/xbmc/imagedecoder.heif comment "kodi-imagedecoder-heif needs a toolchain w/ C++, threads, gcc >= 4.8" - depends on !BR2_m68k_cf # libheif + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/less/less.mk b/package/less/less.mk index 91ce08f4f0..f7211ef112 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,8 +11,4 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses -define LESS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less -endef - $(eval $(autotools-package)) diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index c0a941a0c8..4b536d8117 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -9,6 +9,7 @@ LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE +LIBCOAP_CPE_ID_VENDOR = libcoap LIBCOAP_DEPENDENCIES = host-pkgconf LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls diff --git a/package/libedit/0002-add-sys-types_h.patch b/package/libedit/0002-add-sys-types_h.patch new file mode 100644 index 0000000000..26aa906ee3 --- /dev/null +++ b/package/libedit/0002-add-sys-types_h.patch @@ -0,0 +1,15 @@ +Signed-off-by: Waldemar Brodkorb +Upstream: N/A only reachable via mail + +diff -Nur libedit-20221030-3.1.orig/src/sys.h libedit-20221030-3.1/src/sys.h +--- libedit-20221030-3.1.orig/src/sys.h 2022-10-30 06:35:40.000000000 +0100 ++++ libedit-20221030-3.1/src/sys.h 2023-08-12 09:52:28.137223311 +0200 +@@ -40,7 +40,7 @@ + #ifndef _h_sys + #define _h_sys + +-#if defined(HAVE_SYS_TYPES_H) && defined(__sun) ++#if defined(HAVE_SYS_TYPES_H) + #include + #endif + diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index ecd7d5dbfe..c06ded2a5b 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -60,10 +60,6 @@ LIBGLIB2_MESON_EXTRA_PROPERTIES = \ have_c99_snprintf=true \ have_unix98_printf=true -ifneq ($(BR2_ENABLE_LOCALE),y) -LIBGLIB2_DEPENDENCIES += libiconv -endif - ifeq ($(BR2_PACKAGE_ELFUTILS),y) LIBGLIB2_DEPENDENCIES += elfutils endif @@ -74,7 +70,6 @@ LIBGLIB2_LDFLAGS += -latomic endif ifeq ($(BR2_PACKAGE_LIBICONV),y) -LIBGLIB2_CONF_OPTS += -Diconv=external LIBGLIB2_DEPENDENCIES += libiconv endif diff --git a/package/libheif/Config.in b/package/libheif/Config.in index d0ea72430e..1452cf2718 100644 --- a/package/libheif/Config.in +++ b/package/libheif/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_LIBHEIF bool "libheif" - # avoid build error - # Internal error in emit_expr_encoded at dw2gencfi.c:215 - depends on !BR2_m68k_cf + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help @@ -11,5 +9,5 @@ config BR2_PACKAGE_LIBHEIF https://github.com/strukturag/libheif comment "libheif needs a toolchain w/ C++, gcc >= 4.8" - depends on !BR2_m68k_cf + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 6780d0d81b..fdc4bb034e 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -9,7 +9,7 @@ LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 -LIBKSBA_CPE_ID_VENDOR = libksba_project +LIBKSBA_CPE_ID_VENDOR = gnupg LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr diff --git a/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch b/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch new file mode 100644 index 0000000000..be815a0a61 --- /dev/null +++ b/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch @@ -0,0 +1,29 @@ +From 8187a8456c14eeb3af08c86ffa1228823c9ef1c5 Mon Sep 17 00:00:00 2001 +From: Guido Aulisi +Date: Sun, 25 Jun 2023 15:58:30 +0200 +Subject: [PATCH] Fix use-after-free warning in server.c + +That assignment is not necessary before returning + +Upstream: https://sourceforge.net/p/liblo/git/ci/8187a8456c14eeb3af08c86ffa1228823c9ef1c5/ + +Signed-off-by: Bernd Kuhls +--- + src/server.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/server.c b/src/server.c +index ba02d8e..35c9ba5 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -2289,7 +2289,6 @@ int lo_server_del_lo_method(lo_server s, lo_method m) + free((void *) it->path); + free((void *) it->typespec); + free(it); +- it = prev; + return 0; + } + prev = it; +-- +2.39.2 + diff --git a/package/libserial/0003-Add-missing-cstdint-header-for-uint8_t-type.patch b/package/libserial/0003-Add-missing-cstdint-header-for-uint8_t-type.patch new file mode 100644 index 0000000000..caf02d84f7 --- /dev/null +++ b/package/libserial/0003-Add-missing-cstdint-header-for-uint8_t-type.patch @@ -0,0 +1,28 @@ +From b4ae3313fb313b6acb7f701d898f834133f5bd53 Mon Sep 17 00:00:00 2001 +From: Jussi +Date: Mon, 3 Jul 2023 15:59:07 +0300 +Subject: [PATCH] Add missing cstdint header for uint8_t type +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Upstream: https://github.com/crayzeewulf/libserial/commit/3b50bc2b7464ed527d1709b5c7ba86688e6aa3ec +Signed-off-by: Peter Seiderer +--- + src/libserial/SerialPortConstants.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libserial/SerialPortConstants.h b/src/libserial/SerialPortConstants.h +index 4f05bd5..88dca0b 100644 +--- a/src/libserial/SerialPortConstants.h ++++ b/src/libserial/SerialPortConstants.h +@@ -33,6 +33,7 @@ + + #pragma once + ++#include + #include + #include + #include +-- +2.41.0 + diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 98360204f7..c7d725aa13 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -400,13 +400,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.320" if BR2_KERNEL_HEADERS_4_14 - default "4.19.289" if BR2_KERNEL_HEADERS_4_19 - default "5.4.251" if BR2_KERNEL_HEADERS_5_4 - default "5.10.188" if BR2_KERNEL_HEADERS_5_10 - default "5.15.123" if BR2_KERNEL_HEADERS_5_15 - default "6.1.42" if BR2_KERNEL_HEADERS_6_1 - default "6.4.7" if BR2_KERNEL_HEADERS_6_4 + default "4.14.321" if BR2_KERNEL_HEADERS_4_14 + default "4.19.290" if BR2_KERNEL_HEADERS_4_19 + default "5.4.252" if BR2_KERNEL_HEADERS_5_4 + default "5.10.189" if BR2_KERNEL_HEADERS_5_10 + default "5.15.125" if BR2_KERNEL_HEADERS_5_15 + default "6.1.44" if BR2_KERNEL_HEADERS_6_1 + default "6.4.9" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index 03dc76eaea..5d9c3d8fa8 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -11,6 +11,7 @@ COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_CPE_ID_VENDOR = llvm COMPILER_RT_DEPENDENCIES = host-clang llvm +COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO COMPILER_RT_INSTALL_STAGING = YES COMPILER_RT_INSTALL_TARGET = NO diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index f50267d737..a5569126d4 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -10,6 +10,7 @@ LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE +LOG4CXX_CPE_ID_VENDOR = apache LOG4CXX_CONF_OPTS = \ -DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \ diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index b6a29b3cea..d9e85ac15c 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 80308a614508814ac70eb2ae1ed2c4344dcf6076fa60afc7734d6b1a79e62b16 lsof-4.98.0.tar.gz -sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h +sha256 225222ff9bf38abc2cef7205e9b05c60935efa9ec28d1fd01e503c9316088718 COPYING diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 66911dddb9..303622d111 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -7,9 +7,8 @@ LSOF_VERSION = 4.98.0 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license -# License is repeated in each file, this is a relatively small one. -# It is also defined in 00README, but that contains a lot of other cruft. -LSOF_LICENSE_FILES = dialects/linux/dproto.h +LSOF_LICENSE_FILES = COPYING +LSOF_CPE_ID_VENDOR = lsof_project ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 02fa1535ef..cb36b674fa 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/1.2.0/meson-1.2.0.tar.gz.asc -sha256 1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f meson-1.2.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc +sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 8eabe108c4..503aca8c25 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.2.0 +MESON_VERSION = 1.1.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 2cfd0d9422..cbe54d6d1a 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.15.tar.gz.asc -sha256 4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27039ac6 mosquitto-2.0.15.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.16.tar.gz.asc +sha256 638db9e43e89d243ea98d10d66e76ff376131217780decd01abaffacc66d8035 mosquitto-2.0.16.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index a95a2cac4d..f146a86d0a 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.15 +MOSQUITTO_VERSION = 2.0.16 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8f0af7b2d3..902a3da779 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE config BR2_PACKAGE_MPD_MAD bool "mad" default y - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_LIBMAD help Enable mad input support. @@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG config BR2_PACKAGE_MPD_MPG123 bool "mpg123" - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_MPG123 help Enable mpg123 input support. @@ -407,6 +407,7 @@ config BR2_PACKAGE_MPD_UPNP_PUPNP config BR2_PACKAGE_MPD_UPNP_NPUPNP bool "npupnp" + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_MPD_CURL help diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index d73072a439..f03a459b8c 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -29,6 +29,13 @@ else MPD_CONF_OPTS += -Dzeroconf=disabled endif +ifeq ($(BR2_PACKAGE_EXPAT),y) +MPD_DEPENDENCIES += expat +MPD_CONF_OPTS += -Dexpat=enabled +else +MPD_CONF_OPTS += -Dexpat=disabled +endif + # MPD prefers libicu for utf8 collation instead of libglib2. ifeq ($(BR2_PACKAGE_ICU),y) MPD_DEPENDENCIES += icu @@ -37,6 +44,13 @@ else MPD_CONF_OPTS += -Dicu=disabled endif +ifeq ($(BR2_PACKAGE_YAJL),y) +MPD_DEPENDENCIES += yajl +MPD_CONF_OPTS += -Dyajl=enabled +else +MPD_CONF_OPTS += -Dyajl=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_ALSA),y) MPD_DEPENDENCIES += alsa-lib MPD_CONF_OPTS += -Dalsa=enabled @@ -190,7 +204,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad +MPD_DEPENDENCIES += libmad MPD_CONF_OPTS += -Dmad=enabled else MPD_CONF_OPTS += -Dmad=disabled @@ -204,7 +218,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 +MPD_DEPENDENCIES += mpg123 MPD_CONF_OPTS += -Dmpg123=enabled else MPD_CONF_OPTS += -Dmpg123=disabled @@ -251,7 +265,7 @@ MPD_CONF_OPTS += -Dpulse=disabled endif ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y) -MPD_DEPENDENCIES += libgcrypt yajl +MPD_DEPENDENCIES += libgcrypt MPD_CONF_OPTS += -Dqobuz=enabled else MPD_CONF_OPTS += -Dqobuz=disabled @@ -272,7 +286,6 @@ MPD_CONF_OPTS += -Dsidplay=disabled endif ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) -MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += -Dsoundcloud=enabled else MPD_CONF_OPTS += -Dsoundcloud=disabled @@ -285,8 +298,10 @@ else MPD_CONF_OPTS += -Dsqlite=disabled endif -ifneq ($(BR2_PACKAGE_MPD_TCP),y) +ifeq ($(BR2_PACKAGE_MPD_TCP),y) MPD_CONF_OPTS += -Dtcp=true +else +MPD_CONF_OPTS += -Dtcp=false endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) @@ -305,7 +320,6 @@ endif ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y) MPD_DEPENDENCIES += \ - expat \ libupnp MPD_CONF_OPTS += -Dupnp=pupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 8efb353c33..5c32f593fe 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -26,6 +26,7 @@ config BR2_PACKAGE_MPV select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXPRESENT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index e368b25736..cf37091186 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -205,7 +205,13 @@ endif # xlib_libXrandr, xlib_libXScrnSaver. ifeq ($(BR2_PACKAGE_XORG7),y) MPV_CONF_OPTS += --enable-x11 -MPV_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXinerama xlib_libXrandr xlib_libXScrnSaver +MPV_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXinerama \ + xlib_libXpresent \ + xlib_libXrandr \ + xlib_libXScrnSaver # XVideo ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) MPV_CONF_OPTS += --enable-xv diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 8d172b7256..833a3a38a2 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -13,5 +13,10 @@ config BR2_PACKAGE_NFTABLES http://www.netfilter.org/projects/nftables/index.html +# Legacy: this used to be handled in nftables.mk +if BR2_PACKAGE_NFTABLES +source "package/nftables/nftables-python/Config.in" +endif + comment "nftables needs a toolchain w/ wchar, headers >= 3.12" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package/nftables/nftables-python/Config.in b/package/nftables/nftables-python/Config.in new file mode 100644 index 0000000000..b16e2d0ad1 --- /dev/null +++ b/package/nftables/nftables-python/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_NFTABLES_PYTHON + bool "python bindings" + default y # legacy + depends on BR2_PACKAGE_PYTHON3 diff --git a/package/nftables/nftables-python/nftables-python.hash b/package/nftables/nftables-python/nftables-python.hash new file mode 120000 index 0000000000..9ac74580e7 --- /dev/null +++ b/package/nftables/nftables-python/nftables-python.hash @@ -0,0 +1 @@ +../nftables.hash \ No newline at end of file diff --git a/package/nftables/nftables-python/nftables-python.mk b/package/nftables/nftables-python/nftables-python.mk new file mode 100644 index 0000000000..908bacd99a --- /dev/null +++ b/package/nftables/nftables-python/nftables-python.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# nftables-python +# +################################################################################ + +# The following assignments work only because nftables.mk is included before +# this file is. +NFTABLES_PYTHON_VERSION = $(NFTABLES_VERSION) +NFTABLES_PYTHON_SOURCE = $(NFTABLES_SOURCE) +NFTABLES_PYTHON_SITE = $(NFTABLES_SITE) +NFTABLES_PYTHON_LICENSE = $(NFTABLES_LICENSE) +NFTABLES_PYTHON_LICENSE_FILES = $(NFTABLES_LICENSE_FILES) + +# We share the same source code as nftables +NFTABLES_PYTHON_DL_SUBDIR = nftables + +NFTABLES_PYTHON_SUBDIR = py + +NFTABLES_PYTHON_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index b0a14bd429..d31df8afa4 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -10,9 +10,15 @@ NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING -NFTABLES_CONF_OPTS = --disable-debug --disable-man-doc --disable-pdf-doc NFTABLES_SELINUX_MODULES = iptables +# Python bindings are handled by package nftables-python +NFTABLES_CONF_OPTS = \ + --disable-debug \ + --disable-man-doc \ + --disable-pdf-doc \ + --disable-python + ifeq ($(BR2_PACKAGE_GMP),y) NFTABLES_DEPENDENCIES += gmp NFTABLES_CONF_OPTS += --without-mini-gmp @@ -42,13 +48,6 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) -NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += python3 -else -NFTABLES_CONF_OPTS += --disable-python -endif - NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)" define NFTABLES_LINUX_CONFIG_FIXUPS @@ -58,3 +57,6 @@ define NFTABLES_LINUX_CONFIG_FIXUPS endef $(eval $(autotools-package)) + +# Legacy: we used to handle it in this .mk +include package/nftables/nftables-python/nftables-python.mk diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index 44e04b2403..8d98b5c411 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ad45f5b88d08a159bc9f44ecb79e08358d26d3d22bb6c96ab7aaa3734de130e6 ntpsec-NTPsec_1_2_2.tar.bz2 +sha256 ef901df5a05d486563db22f4d0dad3840a3bf5d0a9aceb8c3ecaeb396c67a805 ntpsec-NTPsec_1_2_2a.tar.bz2 sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2 sha256 5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5 LICENSES/BSD-3 sha256 9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411 LICENSES/CC-BY-4.0 diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index e612e982ec..f6262cdaca 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTPSEC_VERSION = 1.2.2 +NTPSEC_VERSION = 1.2.2a NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index e14d752290..a2c3f16129 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -35,6 +35,10 @@ define OPENSSH_PERMISSIONS /var/empty d 755 root root - - - - - endef +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_110934),y) +OPENSSH_CONF_OPTS += --without-hardening +endif + ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) OPENSSH_CONF_OPTS += --without-pie endif diff --git a/package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch b/package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch new file mode 100644 index 0000000000..b876c3385f --- /dev/null +++ b/package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch @@ -0,0 +1,57 @@ +From a0db2b60b9f5c14e9f69c0e06e1a8d35f9fb1b5a Mon Sep 17 00:00:00 2001 +From: Jerome Forissier +Date: Tue, 25 Jul 2023 14:39:25 +0200 +Subject: [PATCH] xtest: add -DOPENSSL_API_COMPAT=10100 + +regression_1000.c uses OpenSSL functions that have been deprecated +after version 1.1. In particular, building with version 3.0 causes the +following error (and other similar ones not pasted here): + + optee_test/host/xtest/regression_1000.c: In function 'check_signature': + optee_test/host/xtest/regression_1000.c:2735:9: error: 'SHA256_Init' is deprecated: Since OpenSSL 3.0 [-Werror=deprecated-declarations] + 2735 | SHA256_Init(&ctx); + | ^~~~~~~~~~~ + +Add -DOPENSSL_API_COMPAT=10100 to the build flags to avoid this and be +flexible with regards to which version of OpenSSL build environment has +to provide. + +Signed-off-by: Jerome Forissier +Acked-by: Jens Wiklander +(cherry picked from commit cf111604c4c32a76be90f29aab25fa9b882c8715) +Upstream: https://github.com/OP-TEE/optee_test/commit/cf111604c4c32a76be90f29aab25fa9b882c8715 +Signed-off-by: Romain Naour +--- + host/xtest/CMakeLists.txt | 2 +- + host/xtest/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/host/xtest/CMakeLists.txt b/host/xtest/CMakeLists.txt +index 776787b..ae0f4e0 100644 +--- a/host/xtest/CMakeLists.txt ++++ b/host/xtest/CMakeLists.txt +@@ -12,7 +12,7 @@ endif() + + find_package(OpenSSL) + if(OPENSSL_FOUND) +- add_compile_options(-DOPENSSL_FOUND=1) ++ add_compile_options(-DOPENSSL_FOUND=1 -DOPENSSL_API_COMPAT=10100) + set (OPENSSL_PRIVATE_LINK OpenSSL::Crypto) + endif() + +diff --git a/host/xtest/Makefile b/host/xtest/Makefile +index 8505629..2497850 100644 +--- a/host/xtest/Makefile ++++ b/host/xtest/Makefile +@@ -39,7 +39,7 @@ endef + # - User/group login tests 1027 and 1028 + WITH_OPENSSL ?= y + ifeq ($(WITH_OPENSSL),y) +-CFLAGS += -DOPENSSL_FOUND=1 ++CFLAGS += -DOPENSSL_FOUND=1 -DOPENSSL_API_COMPAT=10100 + ifneq ($(OPTEE_OPENSSL_EXPORT),) + LDFLAGS += -lcrypto + CFLAGS += -I$(OPTEE_OPENSSL_EXPORT) +-- +2.41.0 + diff --git a/package/perftest/Config.in b/package/perftest/Config.in index 25cd1a9b8d..6d291b0f72 100644 --- a/package/perftest/Config.in +++ b/package/perftest/Config.in @@ -20,7 +20,8 @@ config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS config BR2_PACKAGE_PERFTEST bool "perftest" depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # rdma-core + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # rdma-core depends on !BR2_STATIC_LIBS # rdma-core # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) depends on !BR2_TOOLCHAIN_USES_MUSL diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 89f4c06de8..1f5e5c0d3b 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 805e638c353c532c2af7a7538d5bd4d6 botocore-1.29.115.tar.gz -sha256 58eee8cf8f4f3e515df29f6dc535dd86ed3f4cea40999c5bc74640ff40bdc71f botocore-1.29.115.tar.gz +md5 efadef54dc1959898a42d4cae949572f botocore-1.31.20.tar.gz +sha256 485ef175cd011ebc965f4577d8cc02a226c46bd608dd2bb75ce6938328cff0fd botocore-1.31.20.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 3e828fef78..b76d1c64d7 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.115 +PYTHON_BOTOCORE_VERSION = 1.31.20 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/9e/00/4560081a431aaa14c2257040d43f56c2ccba816d8bce3b8e1577a19f4076 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/f9/0d/ec24cb66b7651268462d5eb5d9d3c140a99f487db3ed58a45617991b11e8 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index ae5a7a5181..944992f251 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PYTHON_DOCKER select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime help A Python library for the Docker Engine API. diff --git a/package/python-docker/python-docker.hash b/package/python-docker/python-docker.hash index 3fc3c4f0f4..8e561e93a7 100644 --- a/package/python-docker/python-docker.hash +++ b/package/python-docker/python-docker.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/docker/json -md5 8e85e23ed30a3d07129e197d35e56eb4 docker-6.0.1.tar.gz -sha256 896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97 docker-6.0.1.tar.gz +md5 c319e75054a226776f32797e56ec82da docker-6.1.3.tar.gz +sha256 aa6d17830045ba5ef0168d5eaa34d37beeb113948c413affe1d5991fc11f9a20 docker-6.1.3.tar.gz # Locally computed sha256 checksums sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk index 4da972e017..ab03ac6af0 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOCKER_VERSION = 6.0.1 +PYTHON_DOCKER_VERSION = 6.1.3 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz -PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/79/26/6609b51ecb418e12d1534d00b888ce7e108f38b47dc6cd589598d5c6aaa2 +PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/f0/73/f7c9a14e88e769f38cb7fb45aa88dfd795faa8e18aea11bababf6e068d5e PYTHON_DOCKER_SETUP_TYPE = setuptools PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE diff --git a/package/python3/Config.in b/package/python3/Config.in index 761c38c850..38f0580aa4 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_PYTHON3_2TO3 config BR2_PACKAGE_PYTHON3_BERKELEYDB bool "berkeleydb" select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_BERKELEYDB_DBM help berkeleydb module for Python3 diff --git a/package/rockchip-rkbin/Config.in b/package/rockchip-rkbin/Config.in index ae5601db41..6c66acb7e6 100644 --- a/package/rockchip-rkbin/Config.in +++ b/package/rockchip-rkbin/Config.in @@ -9,7 +9,7 @@ if BR2_PACKAGE_ROCKCHIP_RKBIN config BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME string "Rockchip rkbin tpl file path" help - Fath to the tpl file inside the rkbin repository. The + Path to the tpl file inside the rkbin repository. The specified file will be copied and used by U-Boot as tpl. config BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME diff --git a/package/screenfetch/0001-Detect-which-awk-to-use.patch b/package/screenfetch/0001-Detect-which-awk-to-use.patch new file mode 100644 index 0000000000..86e51e5511 --- /dev/null +++ b/package/screenfetch/0001-Detect-which-awk-to-use.patch @@ -0,0 +1,783 @@ +From 39b6eec51f0c2fa5f2b0e876b14dcfc9c1febf97 Mon Sep 17 00:00:00 2001 +From: Nicolas Boichat +Date: Fri, 4 Aug 2023 12:55:36 +0000 +Subject: [PATCH] Detect which awk to use + +Some embedded distributions (e.g. buildroot) may only provide mawk, +without a symlink to awk. + +At first glance, awk scripts to appear to work fine with either +gawk or mawk. + +Signed-off-by: Nicolas Boichat +Upstream: https://github.com/KittyKatt/screenFetch/commit/b49a2334b8ba806dbc532219e86363886a85d9c8 +[rebased on 3.9.1] +--- + screenfetch-dev | 245 +++++++++++++++++++++++++----------------------- + 1 file changed, 130 insertions(+), 115 deletions(-) + +diff --git a/screenfetch-dev b/screenfetch-dev +index 1e53b2c..765930f 100755 +--- a/screenfetch-dev ++++ b/screenfetch-dev +@@ -352,9 +352,9 @@ colorNumberToCode () { + + detectColors () { + my_colors=$(sed 's/^,/na,/;s/,$/,na/;s/,/ /' <<< "${OPTARG}") +- my_lcolor=$(awk -F' ' '{print $1}' <<< "${my_colors}") ++ my_lcolor=$("${AWK}" -F' ' '{print $1}' <<< "${my_colors}") + my_lcolor=$(colorNumberToCode "${my_lcolor}") +- my_hcolor=$(awk -F' ' '{print $2}' <<< "${my_colors}") ++ my_hcolor=$("${AWK}" -F' ' '{print $2}' <<< "${my_colors}") + my_hcolor=$(colorNumberToCode "${my_hcolor}") + } + +@@ -462,7 +462,22 @@ case $1 in + --version) displayVersion; exit 0;; + esac + ++# Detect which awk to use (unless already specified in environment) ++if [[ -z "${AWK}" ]]; then ++ for awk in awk gawk mawk; do ++ if command -v "${awk}" > /dev/null; then ++ AWK="${awk}" ++ break ++ fi ++ done ++fi ++ ++if ! command -v "${AWK}" > /dev/null; then ++ errorOut "No awk interpreter available (AWK=\"${AWK}\")." ++ exit 1 ++fi + ++# Parse the rest of the flags (some of these functions require awk) + while getopts ":hsu:evVEnLNtlS:A:D:o:c:d:pa:w" flags; do + case $flags in + h) displayHelp; exit 0 ;; +@@ -608,8 +623,8 @@ detectdistro () { + "Debian") + if [[ -f /etc/crunchbang-lsb-release || -f /etc/lsb-release-crunchbang ]]; then + distro="CrunchBang" +- distro_release=$(awk -F'=' '/^DISTRIB_RELEASE=/ {print $2}' /etc/lsb-release-crunchbang) +- distro_codename=$(awk -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/lsb-release-crunchbang) ++ distro_release=$("${AWK}" -F'=' '/^DISTRIB_RELEASE=/ {print $2}' /etc/lsb-release-crunchbang) ++ distro_codename=$("${AWK}" -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/lsb-release-crunchbang) + elif [[ -f /etc/siduction-version ]]; then + distro="Siduction" + distro_release="(Debian Sid)" +@@ -620,10 +635,10 @@ detectdistro () { + elif [[ -f /etc/os-release ]]; then + if grep -q -i 'Raspbian' /etc/os-release ; then + distro="Raspbian" +- distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + elif grep -q -i 'BlankOn' /etc/os-release ; then + distro='BlankOn' +- distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + else + distro="Debian" + fi +@@ -639,7 +654,7 @@ detectdistro () { + ;; + "Sulin") + distro="Sulin" +- distro_release=$(awk -F'=' '/^ID_LIKE=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^ID_LIKE=/ {print $2}' /etc/os-release) + distro_codename="Roolling donkey" # this is not wrong :D + ;; + "KaOS"|"kaos") +@@ -718,7 +733,7 @@ detectdistro () { + if grep -q 'SailfishOS' /etc/os-release; then + distro="SailfishOS" + distro_codename="$(grep 'VERSION=' /etc/os-release | cut -d '(' -f2 | cut -d ')' -f1)" +- distro_release="$(awk -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" ++ distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" + fi + fi + ;; +@@ -753,7 +768,7 @@ detectdistro () { + if grep -q -i 'SUSE Linux Enterprise' /etc/os-release ; then + distro="SUSE Linux Enterprise" + distro_codename="n/a" +- distro_release=$(awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"') ++ distro_release=$("${AWK}" -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"') + fi + fi + if [[ "${distro_codename}" == "Tumbleweed" ]]; then +@@ -789,7 +804,7 @@ detectdistro () { + distro="SailfishOS" + if [[ -f /etc/os-release ]]; then + distro_codename="$(grep 'VERSION=' /etc/os-release | cut -d '(' -f2 | cut -d ')' -f1)" +- distro_release="$(awk -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" ++ distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" + fi + ;; + "Sparky"|"SparkyLinux") +@@ -863,12 +878,12 @@ detectdistro () { + ;; + "Haiku") + distro="Haiku" +- distro_more="$(uname -v | awk '/^hrev/ {print $1}')" ++ distro_more="$(uname -v | "${AWK}" '/^hrev/ {print $1}')" + ;; + "GNU/Linux") + if type -p crux >/dev/null 2>&1; then + distro="CRUX" +- distro_more="$(crux | awk '{print $3}')" ++ distro_more="$(crux | "${AWK}" '{print $3}')" + fi + if type -p nixos-version >/dev/null 2>&1; then + distro="NixOS" +@@ -944,7 +959,7 @@ detectdistro () { + [[ "${distro}" == "Neon" ]] && distro="KDE neon" + [[ "${distro}" == "SLED" || "${distro}" == "sled" || "${distro}" == "SLES" || "${distro}" == "sles" ]] && distro="SUSE Linux Enterprise" + if [[ "${distro}" == "SUSE Linux Enterprise" && -f /etc/os-release ]]; then +- distro_more="$(awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"')" ++ distro_more="$("${AWK}" -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"')" + fi + if [[ "${distro}" == "Debian" && -f /usr/bin/pveversion ]]; then + distro="Proxmox VE" +@@ -955,7 +970,7 @@ detectdistro () { + + if [[ "${distro}" == "Unknown" && "${OSTYPE}" =~ "linux" && -f /etc/lsb-release ]]; then + LSB_RELEASE=$(/dev/null; then + distro="Mac OS X" + elif [[ -f /var/run/dmesg.boot ]]; then +- distro=$(awk 'BEGIN { ++ distro=$("${AWK}" 'BEGIN { + distro = "Unknown" + } + { +@@ -1080,7 +1095,7 @@ detectdistro () { + + if [[ "${distro}" == "Unknown" ]] && [[ "${OSTYPE}" =~ "linux" || "${OSTYPE}" == "gnu" ]]; then + if [[ -f /etc/issue ]]; then +- distro=$(awk 'BEGIN { ++ distro=$("${AWK}" 'BEGIN { + distro = "Unknown" + } + { +@@ -1123,8 +1138,8 @@ detectdistro () { + fi + elif [[ -f /etc/lsb-release ]]; then + if grep -q -i 'CHROMEOS_RELEASE_NAME' /etc/lsb-release; then +- distro="$(awk -F'=' '/^CHROMEOS_RELEASE_NAME=/ {print $2}' /etc/lsb-release)" +- distro_more="$(awk -F'=' '/^CHROMEOS_RELEASE_VERSION=/ {print $2}' /etc/lsb-release)" ++ distro="$("${AWK}" -F'=' '/^CHROMEOS_RELEASE_NAME=/ {print $2}' /etc/lsb-release)" ++ distro_more="$("${AWK}" -F'=' '/^CHROMEOS_RELEASE_VERSION=/ {print $2}' /etc/lsb-release)" + fi + fi + fi +@@ -1301,7 +1316,7 @@ detectuptime () { + now=$(date +%s) + uptime=$((now - boot)) + elif [[ "${distro}" == "Haiku" ]]; then +- uptime=$(uptime | awk -F', up ' '{gsub(/ *hours?,/, "h"); gsub(/ *minutes?/, "m"); print $2;}') ++ uptime=$(uptime | "${AWK}" -F', up ' '{gsub(/ *hours?,/, "h"); gsub(/ *minutes?/, "m"); print $2;}') + else + if [[ -f /proc/uptime ]]; then + uptime=$( /dev/null | awk '/OpenGL renderer string/ { sub(/OpenGL renderer string: /,""); print }') ++ gpu=$(glxinfo 2> /dev/null | "${AWK}" '/OpenGL renderer string/ { sub(/OpenGL renderer string: /,""); print }') + elif [[ "${distro}" == "Mac OS X" ]]; then +- gpu=$(system_profiler SPDisplaysDataType | awk -F': ' '/^ *Chipset Model:/ {print $2}' | awk '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') ++ gpu=$(system_profiler SPDisplaysDataType | "${AWK}" -F': ' '/^ *Chipset Model:/ {print $2}' | "${AWK}" '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then + gpu=$(wmic path Win32_VideoController get caption | sed -n '2p') + elif [[ "${distro}" == "Haiku" ]]; then +- gpu="$(listdev | grep -A2 -e 'device Display controller' | awk -F': ' '/^ +device/ {print $2}')" ++ gpu="$(listdev | grep -A2 -e 'device Display controller' | "${AWK}" -F': ' '/^ +device/ {print $2}')" + else + if [[ -n "$(PATH="/opt/bin:$PATH" type -p nvidia-smi)" ]]; then +- gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | awk -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') ++ gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | "${AWK}" -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') + elif [[ -n "$(PATH="/usr/sbin:$PATH" type -p glxinfo)" && -z "${gpu}" ]]; then + gpu_info=$($(PATH="/usr/sbin:$PATH" type -p glxinfo | cut -f1) 2>/dev/null) + gpu=$(grep "OpenGL renderer string" <<< "${gpu_info}" | cut -d ':' -f2 | sed -n -e '1h;2,$H;${g;s/\n/, /g' -e 'p' -e '}') +@@ -1650,12 +1665,12 @@ detectgpu () { + # Run it only on Intel Processors if GPU is unknown + DetectIntelGPU() { + if [ -r /proc/fb ]; then +- gpu=$(awk 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) ++ gpu=$("${AWK}" 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) + fi + + case $gpu in + *mfb) +- gpu=$(lspci | grep -i vga | awk -F ": " '{print $2}') ++ gpu=$(lspci | grep -i vga | "${AWK}" -F ": " '{print $2}') + ;; + *intel*) + gpu="intel" +@@ -1667,7 +1682,7 @@ DetectIntelGPU() { + + if [[ "$gpu" = "intel" ]]; then + #Detect CPU +- local CPU=$(uname -p | awk '{print $3}') ++ local CPU=$(uname -p | "${AWK}" '{print $3}') + CPU=${CPU#*'-'}; #Detect CPU number + + #Detect Intel GPU +@@ -1710,7 +1725,7 @@ detectdisk () { + if [[ "${distro}" =~ (Free|Net|DragonFly)BSD ]]; then + totaldisk=$(df -h -c 2>/dev/null | tail -1) + elif [[ "${distro}" == "OpenBSD" ]]; then +- totaldisk=$(df -Pk 2> /dev/null | awk ' ++ totaldisk=$(df -Pk 2> /dev/null | "${AWK}" ' + /^\// {total+=$2; used+=$3; avail+=$4} + END{printf("total %.1fG %.1fG %.1fG %d%%\n", total/1048576, used/1048576, avail/1048576, used*100/total)}') + elif [[ "${distro}" == "Mac OS X" ]]; then +@@ -1718,9 +1733,9 @@ detectdisk () { + else + totaldisk=$(df -h -x aufs -x tmpfs -x overlay --total 2>/dev/null | tail -1) + fi +- disktotal=$(awk '{print $2}' <<< "${totaldisk}") +- diskused=$(awk '{print $3}' <<< "${totaldisk}") +- diskusedper=$(awk '{print $5}' <<< "${totaldisk}") ++ disktotal=$("${AWK}" '{print $2}' <<< "${totaldisk}") ++ diskused=$("${AWK}" '{print $3}' <<< "${totaldisk}") ++ diskusedper=$("${AWK}" '{print $5}' <<< "${totaldisk}") + diskusage="${diskused} / ${disktotal} (${diskusedper})" + diskusage_verbose=$(sed 's/%/%%/' <<< "$diskusage") + fi +@@ -1733,17 +1748,17 @@ detectdisk () { + detectmem () { + if [ "$distro" == "Mac OS X" ]; then + totalmem=$(echo "$(sysctl -n hw.memsize)" / 1024^2 | bc) +- wiredmem=$(vm_stat | grep wired | awk '{ print $4 }' | sed 's/\.//') +- activemem=$(vm_stat | grep ' active' | awk '{ print $3 }' | sed 's/\.//') +- compressedmem=$(vm_stat | grep occupied | awk '{ print $5 }' | sed 's/\.//') ++ wiredmem=$(vm_stat | grep wired | "${AWK}" '{ print $4 }' | sed 's/\.//') ++ activemem=$(vm_stat | grep ' active' | "${AWK}" '{ print $3 }' | sed 's/\.//') ++ compressedmem=$(vm_stat | grep occupied | "${AWK}" '{ print $5 }' | sed 's/\.//') + if [[ ! -z "$compressedmem | tr -d" ]]; then # FIXME: is this line correct? + compressedmem=0 + fi + usedmem=$(((wiredmem + activemem + compressedmem) * 4 / 1024)) + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then +- total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) ++ total_mem=$("${AWK}" '/MemTotal/ { print $2 }' /proc/meminfo) + totalmem=$((total_mem / 1024)) +- free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) ++ free_mem=$("${AWK}" '/MemFree/ { print $2 }' /proc/meminfo) + used_mem=$((total_mem - free_mem)) + usedmem=$((used_mem / 1024)) + elif [[ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]]; then +@@ -1769,21 +1784,21 @@ detectmem () { + usedmem=$((used_mem / 1024 / 1024)) + elif [ "$distro" == "OpenBSD" ]; then + totalmem=$(($(sysctl -n hw.physmem) / 1024 / 1024)) +- usedmem=$(vmstat | awk '!/[a-z]/{gsub("M",""); print $3}') ++ usedmem=$(vmstat | "${AWK}" '!/[a-z]/{gsub("M",""); print $3}') + elif [ "$distro" == "NetBSD" ]; then +- phys_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) ++ phys_mem=$("${AWK}" '/MemTotal/ { print $2 }' /proc/meminfo) + totalmem=$((phys_mem / 1024)) + if grep -q 'Cached' /proc/meminfo; then +- cache=$(awk '/Cached/ {print $2}' /proc/meminfo) ++ cache=$("${AWK}" '/Cached/ {print $2}' /proc/meminfo) + usedmem=$((cache / 1024)) + else +- free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) ++ free_mem=$("${AWK}" '/MemFree/ { print $2 }' /proc/meminfo) + used_mem=$((phys_mem - free_mem)) + usedmem=$((used_mem / 1024)) + fi + elif [ "$distro" == "Haiku" ]; then +- totalmem=$(sysinfo -mem | awk 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $6/1024**2)}') +- usedmem=$(sysinfo -mem | awk 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $5/1024**2)}') ++ totalmem=$(sysinfo -mem | "${AWK}" 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $6/1024**2)}') ++ usedmem=$(sysinfo -mem | "${AWK}" 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $5/1024**2)}') + else + # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable + # Source: https://github.com/dylanaraps/neofetch/pull/391/files#diff-e863270127ca6116fd30e708cdc582fc +@@ -1798,7 +1813,7 @@ detectmem () { + #done + #usedmem=$((usedmem / 1024)) + #totalmem=$((totalmem / 1024)) +- mem=$(free -b | awk 'NR==2{print $2"-"$7}') ++ mem=$(free -b | "${AWK}" 'NR==2{print $2"-"$7}') + usedmem=$((mem / 1024 / 1024)) + totalmem=$((${mem//-*} / 1024 / 1024)) + fi +@@ -1823,7 +1838,7 @@ detectshell_ver () { + esac + + if [[ -n $version_data ]];then +- version=$(awk ' ++ version=$("${AWK}" ' + BEGIN { + IGNORECASE=1 + } +@@ -1842,7 +1857,7 @@ detectshell () { + if [[ ! "${shell_type}" ]]; then + if [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" || "${distro}" == "Haiku" || "${distro}" == "Alpine Linux" || + "${distro}" == "Mac OS X" || "${distro}" == "TinyCore" || "${distro}" == "Raspbian" || "${OSTYPE}" == "gnu" ]]; then +- shell_type=$(echo "$SHELL" | awk -F'/' '{print $NF}') ++ shell_type=$(echo "$SHELL" | "${AWK}" -F'/' '{print $NF}') + elif readlink -f "$SHELL" 2>&1 | grep -q -i 'busybox'; then + shell_type="BusyBox" + else +@@ -1851,7 +1866,7 @@ detectshell () { + elif [[ "${distro}" =~ "BSD" ]]; then + shell_type=$(ps -p $PPID -o command | tail -1) + else +- shell_type=$(ps -p "$(ps -p $PPID | awk '$1 !~ /PID/ {print $1}')" | awk 'FNR>1 {print $1}') ++ shell_type=$(ps -p "$(ps -p $PPID | "${AWK}" '$1 !~ /PID/ {print $1}')" | "${AWK}" 'FNR>1 {print $1}') + fi + shell_type=${shell_type/-} + shell_type=${shell_type//*\/} +@@ -1881,7 +1896,7 @@ detectshell () { + shell_version_data=$( detectshell_ver "$shell_type" "^zsh" "2" ) + ;; + fish) +- shell_version_data=$( fish --version | awk '{print $3}' ) ++ shell_version_data=$( fish --version | "${AWK}" '{print $3}' ) + ;; + esac + +@@ -1899,17 +1914,17 @@ detectshell () { + detectres () { + xResolution="No X Server" + if [[ ${distro} == "Mac OS X" ]]; then +- xResolution=$(system_profiler SPDisplaysDataType | awk '/Resolution:/ {print $2"x"$4" "}') ++ xResolution=$(system_profiler SPDisplaysDataType | "${AWK}" '/Resolution:/ {print $2"x"$4" "}') + if [[ "$(echo "$xResolution" | wc -l)" -ge 1 ]]; then + xResolution=$(echo "$xResolution" | tr "\\n" "," | sed 's/\(.*\),/\1/') + fi + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then +- xResolution=$(wmic path Win32_VideoController get CurrentHorizontalResolution,CurrentVerticalResolution | awk 'NR==2 {print $1"x"$2}') ++ xResolution=$(wmic path Win32_VideoController get CurrentHorizontalResolution,CurrentVerticalResolution | "${AWK}" 'NR==2 {print $1"x"$2}') + elif [[ "${distro}" == "Haiku" ]]; then +- xResolution="$(screenmode | grep Resolution | awk '{gsub(/,/,""); print $2"x"$3}')" ++ xResolution="$(screenmode | grep Resolution | "${AWK}" '{gsub(/,/,""); print $2"x"$3}')" + elif [[ -n ${DISPLAY} ]]; then + if type -p xdpyinfo >/dev/null 2>&1; then +- xResolution=$(xdpyinfo | awk '/^ +dimensions/ {print $2}') ++ xResolution=$(xdpyinfo | "${AWK}" '/^ +dimensions/ {print $2}') + fi + fi + verboseOut "Finding current resolution(s)...found as '$xResolution'" +@@ -1937,7 +1952,7 @@ detectde () { + if type -p xprop >/dev/null 2>&1;then + xprop_root="$(xprop -root 2>/dev/null)" + if [[ -n ${xprop_root} ]]; then +- DE=$(echo "${xprop_root}" | awk 'BEGIN { ++ DE=$(echo "${xprop_root}" | "${AWK}" 'BEGIN { + de = "Not Present" + } + { +@@ -2099,7 +2114,7 @@ detectde () { + elif [[ ${KDE_FULL_SESSION} == 'true' ]]; then + DE="KDE" + DEver_data=$(kded --version 2>/dev/null) +- DEver=$(grep -si '^KDE:' <<< "$DEver_data" | awk '{print $2}') ++ DEver=$(grep -si '^KDE:' <<< "$DEver_data" | "${AWK}" '{print $2}') + fi + fi + fi +@@ -2154,7 +2169,7 @@ detectde () { + fi + elif [[ ${DE} == "LXQt" ]]; then + if type -p lxqt-about >/dev/null 2>&1; then +- DEver=$(lxqt-about --version | awk '/^liblxqt/ {print $2}') ++ DEver=$(lxqt-about --version | "${AWK}" '/^liblxqt/ {print $2}') + DE="${DE} ${DEver}" + fi + elif [[ ${DE} == "MATE" ]]; then +@@ -2169,12 +2184,12 @@ detectde () { + fi + elif [[ ${DE} == "Deepin" ]]; then + if [[ -f /etc/deepin-version ]]; then +- DEver="$(awk -F '=' '/Version/ {print $2}' /etc/deepin-version)" ++ DEver="$("${AWK}" -F '=' '/Version/ {print $2}' /etc/deepin-version)" + DE="${DE} ${DEver//* }" + fi + elif [[ ${DE} == "Trinity" ]]; then + if type -p tde-config >/dev/null 2>&1; then +- DEver="$(tde-config --version | awk -F ' ' '/TDE:/ {print $2}')" ++ DEver="$(tde-config --version | "${AWK}" -F ' ' '/TDE:/ {print $2}')" + DE="${DE} ${DEver//* }" + fi + fi +@@ -2418,7 +2433,7 @@ detectwmtheme () { + else + themeFile="$(reg query 'HKCU\Software\Microsoft\Windows\CurrentVersion\Themes' /v 'CurrentTheme')" + fi +- Win_theme=$(echo "$themeFile" | awk -F"\\" '{print $NF}' | sed 's|\.theme$||') ++ Win_theme=$(echo "$themeFile" | "${AWK}" -F"\\" '{print $NF}' | sed 's|\.theme$||') + fi + else + case $WM in +@@ -2433,7 +2448,7 @@ detectwmtheme () { + ;; + 'BlackBox') + if [ -f "$HOME/.blackboxrc" ]; then +- Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' "$HOME/.blackboxrc")" ++ Win_theme="$("${AWK}" -F"/" '/styleFile/ {print $NF}' "$HOME/.blackboxrc")" + fi + ;; + 'BudgieWM') +@@ -2465,11 +2480,11 @@ detectwmtheme () { + fi + ;; + 'E16') +- Win_theme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")" ++ Win_theme="$("${AWK}" -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")" + ;; + 'E17'|'Enlightenment') + if [ "$(which eet 2>/dev/null)" ]; then +- econfig="$(eet -d "$HOME/.e/e/config/standard/e.cfg" config | awk '/value \"file\" string.*.edj/{ print $4 }')" ++ econfig="$(eet -d "$HOME/.e/e/config/standard/e.cfg" config | "${AWK}" '/value \"file\" string.*.edj/{ print $4 }')" + econfigend="${econfig##*/}" + Win_theme=${econfigend%.*} + elif [ -n "${E_CONF_PROFILE}" ]; then +@@ -2485,12 +2500,12 @@ detectwmtheme () { + ;; + 'FluxBox'|'Fluxbox') + if [ -f "$HOME/.fluxbox/init" ]; then +- Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" ++ Win_theme="$("${AWK}" -F"/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" + fi + ;; + 'IceWM') + if [ -f "$HOME/.icewm/theme" ]; then +- Win_theme="$(awk -F"[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" ++ Win_theme="$("${AWK}" -F"[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" + fi + ;; + 'KWin'*) +@@ -2507,14 +2522,14 @@ detectwmtheme () { + Win_theme="Not Applicable" + KDE_CONFIG_DIR=${KDE_CONFIG_DIR%/} + if [[ -f $KDE_CONFIG_DIR/share/config/kwinrc ]]; then +- Win_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$KDE_CONFIG_DIR/share/config/kwinrc")" ++ Win_theme="$("${AWK}" '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$KDE_CONFIG_DIR/share/config/kwinrc")" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi + fi + if [[ "$Win_theme" == "Not Applicable" ]]; then + if [[ -f $KDE_CONFIG_DIR/share/config/kdebugrc ]]; then +- Win_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$KDE_CONFIG_DIR/share/config/kdebugrc")" ++ Win_theme="$("${AWK}" '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$KDE_CONFIG_DIR/share/config/kdebugrc")" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi +@@ -2522,7 +2537,7 @@ detectwmtheme () { + fi + if [[ "$Win_theme" == "Not Applicable" ]]; then + if [[ -f $KDE_CONFIG_DIR/share/config/kdeglobals ]]; then +- Win_theme="$(awk '/\[General\]/ {flag=1;next} /^$/{flag=0} flag {print}' "$KDE_CONFIG_DIR/share/config/kdeglobals" | grep -oP 'Name=\K.*')" ++ Win_theme="$("${AWK}" '/\[General\]/ {flag=1;next} /^$/{flag=0} flag {print}' "$KDE_CONFIG_DIR/share/config/kdeglobals" | grep -oP 'Name=\K.*')" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi +@@ -2552,20 +2567,20 @@ detectwmtheme () { + ;; + 'OpenBox'|'Openbox') + if [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/openbox/rc.xml" ]; then +- Win_theme="$(awk -F"[<,>]" '/]" '/]" '/]" '//dev/null 2>&1; then + gtk2Theme=$(xfconf-query -c xsettings -p /Net/ThemeName 2>/dev/null) +@@ -2779,15 +2794,15 @@ detectgtk () { + fi + + if grep -q 'sNet\/ThemeName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtk2Theme=$(awk -F'=' '/sNet\/ThemeName/ {print $2}' "${config_home}${lxdeconf}") ++ gtk2Theme=$("${AWK}" -F'=' '/sNet\/ThemeName/ {print $2}' "${config_home}${lxdeconf}") + fi + + if grep -q 'IconThemeName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtkIcons=$(awk -F'=' '/sNet\/IconThemeName/ {print $2}' "${config_home}${lxdeconf}") ++ gtkIcons=$("${AWK}" -F'=' '/sNet\/IconThemeName/ {print $2}' "${config_home}${lxdeconf}") + fi + + if grep -q 'FontName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtkFont=$(awk -F'=' '/sGtk\/FontName/ {print $2}' "${config_home}${lxdeconf}") ++ gtkFont=$("${AWK}" -F'=' '/sGtk\/FontName/ {print $2}' "${config_home}${lxdeconf}") + fi + ;; + +@@ -2796,15 +2811,15 @@ detectgtk () { + *) # Lightweight or No DE Found + if [ -f "$HOME/.gtkrc-2.0" ]; then + if grep -q 'gtk-theme' "$HOME/.gtkrc-2.0"; then +- gtk2Theme=$(awk -F'"' '/^gtk-theme/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-theme/ {print $2}' "$HOME/.gtkrc-2.0") + fi + + if grep -q 'icon-theme' "$HOME/.gtkrc-2.0"; then +- gtkIcons=$(awk -F'"' '/^gtk-icon-theme/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtkIcons=$("${AWK}" -F'"' '/^gtk-icon-theme/ {print $2}' "$HOME/.gtkrc-2.0") + fi + + if grep -q 'font' "$HOME/.gtkrc-2.0"; then +- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtkFont=$("${AWK}" -F'"' '/^gtk-font-name/ {print $2}' "$HOME/.gtkrc-2.0") + fi + fi + # $HOME/.gtkrc.mine theme detect only +@@ -2815,37 +2830,37 @@ detectgtk () { + fi + if [ -f "$minegtkrc" ]; then + if grep -q '^include' "$minegtkrc"; then +- gtk2Theme=$(grep '^include.*gtkrc' "$minegtkrc" | awk -F "/" '{ print $5 }') ++ gtk2Theme=$(grep '^include.*gtkrc' "$minegtkrc" | "${AWK}" -F "/" '{ print $5 }') + fi + if grep -q '^gtk-icon-theme-name' "$minegtkrc"; then +- gtkIcons=$(grep '^gtk-icon-theme-name' "$minegtkrc" | awk -F '"' '{print $2}') ++ gtkIcons=$(grep '^gtk-icon-theme-name' "$minegtkrc" | "${AWK}" -F '"' '{print $2}') + fi + fi + # /etc/gtk-2.0/gtkrc compatibility + if [[ -f /etc/gtk-2.0/gtkrc && ! -f "$HOME/.gtkrc-2.0" && ! -f "$HOME/.gtkrc.mine" && ! -f "$HOME/.gtkrc-2.0.mine" ]]; then + if grep -q 'gtk-theme-name' /etc/gtk-2.0/gtkrc; then +- gtk2Theme=$(awk -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + if grep -q 'gtk-fallback-theme-name' /etc/gtk-2.0/gtkrc && ! [ "x$gtk2Theme" = "x" ]; then +- gtk2Theme=$(awk -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + + if grep -q 'icon-theme' /etc/gtk-2.0/gtkrc; then +- gtkIcons=$(awk -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkIcons=$("${AWK}" -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + if grep -q 'gtk-fallback-icon-theme' /etc/gtk-2.0/gtkrc && ! [ "x$gtkIcons" = "x" ]; then +- gtkIcons=$(awk -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkIcons=$("${AWK}" -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + + if grep -q 'font' /etc/gtk-2.0/gtkrc; then +- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkFont=$("${AWK}" -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + fi + + # EXPERIMENTAL gtk3 Theme detection + if [[ "$gtk3Theme" = "Not Found" && -f "$HOME/.config/gtk-3.0/settings.ini" ]]; then + if grep -q 'gtk-theme-name' "$HOME/.config/gtk-3.0/settings.ini"; then +- gtk3Theme=$(awk -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini") ++ gtk3Theme=$("${AWK}" -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini") + fi + fi + +@@ -2859,7 +2874,7 @@ detectgtk () { + + # ROX-Filer icon detect only + if [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options" ]; then +- gtkIcons=$(awk -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options") ++ gtkIcons=$("${AWK}" -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options") + fi + + # E17 detection +@@ -2872,10 +2887,10 @@ detectgtk () { + # Background Detection (feh, nitrogen) + if [ "$background_detect" == "1" ]; then + if [ -a "$HOME/.fehbg" ]; then +- gtkBackgroundFull=$(awk -F"'" '/feh --bg/{print $2}' "$HOME/.fehbg" 2>/dev/null) +- gtkBackground=$(echo "$gtkBackgroundFull" | awk -F"/" '{print $NF}') ++ gtkBackgroundFull=$("${AWK}" -F"'" '/feh --bg/{print $2}' "$HOME/.fehbg" 2>/dev/null) ++ gtkBackground=$(echo "$gtkBackgroundFull" | "${AWK}" -F"/" '{print $NF}') + elif [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg" ]; then +- gtkBackground=$(awk -F"/" '/file=/ {print $NF}' "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg") ++ gtkBackground=$("${AWK}" -F"/" '/file=/ {print $NF}' "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg") + fi + fi + +@@ -2910,7 +2925,7 @@ detectdroid () { + rom=$(getprop ro.build.display.id) + fi + baseband=$(getprop ro.baseband) +- cpu=$(awk -F': ' '/^Processor/ {P=$2} /^Hardware/ {H=$2} END {print H != "" ? H : P}' /proc/cpuinfo) ++ cpu=$("${AWK}" -F': ' '/^Processor/ {P=$2} /^Hardware/ {H=$2} END {print H != "" ? H : P}' /proc/cpuinfo) + } + + +@@ -6032,7 +6047,7 @@ asciiText () { + #n=${#fulloutput[*]} + for ((i=0; i<${#fulloutput[*]}; i++)); do + # echo "${out_array[@]}" +- case $(awk 'BEGIN{srand();print int(rand()*(1000-1))+1 }') in ++ case $("${AWK}" 'BEGIN{srand();print int(rand()*(1000-1))+1 }') in + 411|188|15|166|609) + f_size=${#fulloutput[*]} + o_size=${#out_array[*]} +-- +2.41.0.640.ga95def55d0-goog + diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index eedb99492f..0e344550d3 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -9,6 +9,7 @@ SNGREP_SITE = \ https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE +SNGREP_CPE_ID_VENDOR = irontec SNGREP_AUTORECONF = YES SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 4dc5692d79..43c99413dd 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -18,8 +18,11 @@ STELLARIUM_DEPENDENCIES = \ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_SHOWMYSKY=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ + -DENABLE_XLSX=OFF \ + -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) @@ -34,13 +37,9 @@ STELLARIUM_DEPENDENCIES += qt5serialport ifeq ($(BR2_PACKAGE_GPSD),y) STELLARIUM_DEPENDENCIES += gpsd endif -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=ON \ - -DUSE_PLUGIN_TELESCOPECONTROL=ON +STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON else -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=OFF \ - -DUSE_PLUGIN_TELESCOPECONTROL=OFF +STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF endif $(eval $(cmake-package)) diff --git a/package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch b/package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch new file mode 100644 index 0000000000..b91fddb20b --- /dev/null +++ b/package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch @@ -0,0 +1,113 @@ +From 6823bacb3c2564bff5da3175c574fd6a6af4d8b2 Mon Sep 17 00:00:00 2001 +From: chuhu +Date: Sat, 1 Jul 2023 01:02:37 +0800 +Subject: [PATCH] ioctls/drm: check i810,mga,r128 and savage support (#44) + +kernel v6.3-rc1 removed some drm drivers, so add the extra check to make +the compile succeed. + +7872bc2cb13e drm: Remove the obsolete driver-savage +28483b8666bf drm: Remove the obsolete driver-r128 +96ed7db55bef drm: Remove the obsolete driver-mga +cab18866fead drm: Remove the obsolete driver-i810 + +Signed-off-by: Chunyu Hu +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/kernelslacker/trinity/commit/6823bacb3c2564bff5da3175c574fd6a6af4d8b2 +--- + configure | 4 ++++ + ioctls/drm.c | 14 ++++++++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/configure b/configure +index 944c8cf7..bbaf9afc 100755 +--- a/configure ++++ b/configure +@@ -320,6 +320,10 @@ check_header linux/irda.h USE_IRDA + check_header linux/rds.h USE_RDS + check_header linux/vfio.h USE_VFIO + check_header drm/drm.h USE_DRM ++check_header drm/i810_drm.h USE_DRM_I810 ++check_header drm/mga_drm.h USE_DRM_MGA ++check_header drm/r128_drm.h USE_DRM_R128 ++check_header drm/savage_drm.h USE_DRM_SAVAGE + check_header drm/exynos_drm.h USE_DRM_EXYNOS + check_header sound/compress_offload.h USE_SNDDRV_COMPRESS_OFFLOAD + check_header linux/kvm.h USE_KVM +diff --git a/ioctls/drm.c b/ioctls/drm.c +index 81ed3682..a07a8436 100644 +--- a/ioctls/drm.c ++++ b/ioctls/drm.c +@@ -8,13 +8,21 @@ + #ifdef USE_DRM_EXYNOS + #include + #endif ++#ifdef USE_DRM_I810 + #include ++#endif + #include ++#ifdef USE_DRM_MGA + #include ++#endif + #include ++#ifdef USE_DRM_R128 + #include ++#endif + #include ++#ifdef USE_DRM_SAVAGE + #include ++#endif + + #include "ioctls.h" + #include "utils.h" +@@ -293,6 +301,7 @@ static const struct ioctl drm_ioctls[] = { + #endif + #endif + ++#ifdef USE_DRM_I810 + /* i810_drm.h */ + IOCTL(DRM_IOCTL_I810_INIT), + IOCTL(DRM_IOCTL_I810_VERTEX), +@@ -309,6 +318,7 @@ static const struct ioctl drm_ioctls[] = { + IOCTL(DRM_IOCTL_I810_MC), + IOCTL(DRM_IOCTL_I810_RSTATUS), + IOCTL(DRM_IOCTL_I810_FLIP), ++#endif + + /* i915_drm.h */ + IOCTL(DRM_IOCTL_I915_INIT), +@@ -378,6 +388,7 @@ static const struct ioctl drm_ioctls[] = { + IOCTL(DRM_IOCTL_I915_REG_READ), + #endif + ++#ifdef USE_DRM_MGA + /* mga_drm.h */ + IOCTL(DRM_IOCTL_MGA_INIT), + IOCTL(DRM_IOCTL_MGA_FLUSH), +@@ -401,6 +412,7 @@ static const struct ioctl drm_ioctls[] = { + IOCTL(DRM_IOCTL_NOUVEAU_GROBJ_ALLOC), + IOCTL(DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC), + IOCTL(DRM_IOCTL_NOUVEAU_GPUOBJ_FREE), ++#endif + #ifdef DRM_IOCTL_NOUVEAU_GEM_NEW + IOCTL(DRM_IOCTL_NOUVEAU_GEM_NEW), + #endif +@@ -417,6 +429,7 @@ static const struct ioctl drm_ioctls[] = { + IOCTL(DRM_IOCTL_NOUVEAU_GEM_INFO), + #endif + ++#ifdef USE_DRM_R128 + /* r128_drm.h */ + IOCTL(DRM_IOCTL_R128_INIT), + IOCTL(DRM_IOCTL_R128_CCE_START), +@@ -435,6 +448,7 @@ static const struct ioctl drm_ioctls[] = { + IOCTL(DRM_IOCTL_R128_FULLSCREEN), + IOCTL(DRM_IOCTL_R128_GETPARAM), + IOCTL(DRM_IOCTL_R128_FLIP), ++#endif + + /* radeon_drm.h */ + IOCTL(DRM_IOCTL_RADEON_CP_INIT), +-- +2.39.2 + diff --git a/package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch b/package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch new file mode 100644 index 0000000000..4277983694 --- /dev/null +++ b/package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch @@ -0,0 +1,30 @@ +From ca07c86b2aeeb91213922eaf481c9e224679a7fd Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Fri, 17 Mar 2023 20:28:24 +0100 +Subject: [PATCH] kvm: drop KVM_SET_MEMORY_REGION (#42) + +It was dropped in upstream in commit 61e15f871241 (KVM: Delete all +references to removed KVM_SET_MEMORY_REGION ioctl). + +Co-authored-by: Jiri Slaby +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/kernelslacker/trinity/commit/ca07c86b2aeeb91213922eaf481c9e224679a7fd +--- + ioctls/kvm.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ioctls/kvm.c b/ioctls/kvm.c +index 14c55ef1..30aeed7a 100644 +--- a/ioctls/kvm.c ++++ b/ioctls/kvm.c +@@ -8,7 +8,6 @@ + #include "utils.h" + + static const struct ioctl kvm_ioctls[] = { +- IOCTL(KVM_SET_MEMORY_REGION), + IOCTL(KVM_CREATE_VCPU), + IOCTL(KVM_GET_DIRTY_LOG), + IOCTL(KVM_SET_NR_MMU_PAGES), +-- +2.39.2 + diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 3d21897c6d..fa06f345e9 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -1,14 +1,14 @@ comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_8 menuconfig BR2_PACKAGE_TVHEADEND bool "tvheadend" depends on !BR2_STATIC_LIBS # dladdr() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_8 select BR2_PACKAGE_DTV_SCAN_TABLES select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSL diff --git a/package/uclibc/0001-aarch64-add-hwcap-header-file.patch b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch new file mode 100644 index 0000000000..058e3242f9 --- /dev/null +++ b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch @@ -0,0 +1,163 @@ +From becd0cbc4168534e311f47dda6f67450ad0006b5 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Tue, 8 Aug 2023 13:47:27 +0200 +Subject: [PATCH] aarch64: add hwcap header file + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=becd0cbc4168534e311f47dda6f67450ad0006b5 +--- + include/sys/auxv.h | 1 + + libc/sysdeps/linux/aarch64/bits/hwcap.h | 99 +++++++++++++++++++++++++ + libc/sysdeps/linux/common/bits/hwcap.h | 22 ++++++ + 3 files changed, 122 insertions(+) + create mode 100644 libc/sysdeps/linux/aarch64/bits/hwcap.h + create mode 100644 libc/sysdeps/linux/common/bits/hwcap.h + +diff --git a/include/sys/auxv.h b/include/sys/auxv.h +index f35196423..b07026457 100644 +--- a/include/sys/auxv.h ++++ b/include/sys/auxv.h +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + __BEGIN_DECLS + +diff --git a/libc/sysdeps/linux/aarch64/bits/hwcap.h b/libc/sysdeps/linux/aarch64/bits/hwcap.h +new file mode 100644 +index 000000000..20061f5d1 +--- /dev/null ++++ b/libc/sysdeps/linux/aarch64/bits/hwcap.h +@@ -0,0 +1,99 @@ ++/* Defines for bits in AT_HWCAP. AArch64 Linux version. ++ Copyright (C) 2016-2023 Free Software Foundation, Inc. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#if !defined (_SYS_AUXV_H) ++# error "Never include directly; use instead." ++#endif ++ ++/* The following must match the kernel's and update the ++ list together with sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c. */ ++#define HWCAP_FP (1 << 0) ++#define HWCAP_ASIMD (1 << 1) ++#define HWCAP_EVTSTRM (1 << 2) ++#define HWCAP_AES (1 << 3) ++#define HWCAP_PMULL (1 << 4) ++#define HWCAP_SHA1 (1 << 5) ++#define HWCAP_SHA2 (1 << 6) ++#define HWCAP_CRC32 (1 << 7) ++#define HWCAP_ATOMICS (1 << 8) ++#define HWCAP_FPHP (1 << 9) ++#define HWCAP_ASIMDHP (1 << 10) ++#define HWCAP_CPUID (1 << 11) ++#define HWCAP_ASIMDRDM (1 << 12) ++#define HWCAP_JSCVT (1 << 13) ++#define HWCAP_FCMA (1 << 14) ++#define HWCAP_LRCPC (1 << 15) ++#define HWCAP_DCPOP (1 << 16) ++#define HWCAP_SHA3 (1 << 17) ++#define HWCAP_SM3 (1 << 18) ++#define HWCAP_SM4 (1 << 19) ++#define HWCAP_ASIMDDP (1 << 20) ++#define HWCAP_SHA512 (1 << 21) ++#define HWCAP_SVE (1 << 22) ++#define HWCAP_ASIMDFHM (1 << 23) ++#define HWCAP_DIT (1 << 24) ++#define HWCAP_USCAT (1 << 25) ++#define HWCAP_ILRCPC (1 << 26) ++#define HWCAP_FLAGM (1 << 27) ++#define HWCAP_SSBS (1 << 28) ++#define HWCAP_SB (1 << 29) ++#define HWCAP_PACA (1 << 30) ++#define HWCAP_PACG (1UL << 31) ++ ++#define HWCAP2_DCPODP (1 << 0) ++#define HWCAP2_SVE2 (1 << 1) ++#define HWCAP2_SVEAES (1 << 2) ++#define HWCAP2_SVEPMULL (1 << 3) ++#define HWCAP2_SVEBITPERM (1 << 4) ++#define HWCAP2_SVESHA3 (1 << 5) ++#define HWCAP2_SVESM4 (1 << 6) ++#define HWCAP2_FLAGM2 (1 << 7) ++#define HWCAP2_FRINT (1 << 8) ++#define HWCAP2_SVEI8MM (1 << 9) ++#define HWCAP2_SVEF32MM (1 << 10) ++#define HWCAP2_SVEF64MM (1 << 11) ++#define HWCAP2_SVEBF16 (1 << 12) ++#define HWCAP2_I8MM (1 << 13) ++#define HWCAP2_BF16 (1 << 14) ++#define HWCAP2_DGH (1 << 15) ++#define HWCAP2_RNG (1 << 16) ++#define HWCAP2_BTI (1 << 17) ++#define HWCAP2_MTE (1 << 18) ++#define HWCAP2_ECV (1 << 19) ++#define HWCAP2_AFP (1 << 20) ++#define HWCAP2_RPRES (1 << 21) ++#define HWCAP2_MTE3 (1 << 22) ++#define HWCAP2_SME (1 << 23) ++#define HWCAP2_SME_I16I64 (1 << 24) ++#define HWCAP2_SME_F64F64 (1 << 25) ++#define HWCAP2_SME_I8I32 (1 << 26) ++#define HWCAP2_SME_F16F32 (1 << 27) ++#define HWCAP2_SME_B16F32 (1 << 28) ++#define HWCAP2_SME_F32F32 (1 << 29) ++#define HWCAP2_SME_FA64 (1 << 30) ++#define HWCAP2_WFXT (1UL << 31) ++#define HWCAP2_EBF16 (1UL << 32) ++#define HWCAP2_SVE_EBF16 (1UL << 33) ++#define HWCAP2_CSSC (1UL << 34) ++#define HWCAP2_RPRFM (1UL << 35) ++#define HWCAP2_SVE2P1 (1UL << 36) ++#define HWCAP2_SME2 (1UL << 37) ++#define HWCAP2_SME2P1 (1UL << 38) ++#define HWCAP2_SME_I16I32 (1UL << 39) ++#define HWCAP2_SME_BI32I32 (1UL << 40) ++#define HWCAP2_SME_B16B16 (1UL << 41) ++#define HWCAP2_SME_F16F16 (1UL << 42) +diff --git a/libc/sysdeps/linux/common/bits/hwcap.h b/libc/sysdeps/linux/common/bits/hwcap.h +new file mode 100644 +index 000000000..e7b899df0 +--- /dev/null ++++ b/libc/sysdeps/linux/common/bits/hwcap.h +@@ -0,0 +1,22 @@ ++/* Defines for bits in AT_HWCAP. ++ Copyright (C) 2012-2023 Free Software Foundation, Inc. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef _SYS_AUXV_H ++# error "Never include directly; use instead." ++#endif ++ ++/* No bits defined for this architecture. */ +-- +2.30.2 + diff --git a/package/uclibc/0001-gettimeofday-fix-static-build.patch b/package/uclibc/0001-gettimeofday-fix-static-build.patch deleted file mode 100644 index 2ef5059f05..0000000000 --- a/package/uclibc/0001-gettimeofday-fix-static-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b19f8f360970ffd0c1a6ac41e07c66dc39790b16 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 10 May 2023 08:35:25 +0200 -Subject: [PATCH] gettimeofday: fix static build - -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=b19f8f360970ffd0c1a6ac41e07c66dc39790b16 ---- - libc/sysdeps/linux/common/gettimeofday.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c -index e5141088e..12473a8e6 100755 ---- a/libc/sysdeps/linux/common/gettimeofday.c -+++ b/libc/sysdeps/linux/common/gettimeofday.c -@@ -9,8 +9,9 @@ - #include - #include - -+#ifdef SHARED - #include "ldso.h" -- -+#endif - - - #ifdef __VDSO_SUPPORT__ --- -2.30.2 - diff --git a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch new file mode 100644 index 0000000000..da0135a5e3 --- /dev/null +++ b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch @@ -0,0 +1,85 @@ +From 98576ab8de710507419b016fbcfc82ed7c57f9c3 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 9 Aug 2023 10:31:28 +0200 +Subject: [PATCH] fcntl.h: declare f_owner_ex for all architectures + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=98576ab8de710507419b016fbcfc82ed7c57f9c3 +--- + include/fcntl.h | 20 ++++++++++++++++++++ + libc/sysdeps/linux/aarch64/bits/fcntl.h | 21 --------------------- + 2 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/include/fcntl.h b/include/fcntl.h +index 136f64d70..ce15ceaf6 100644 +--- a/include/fcntl.h ++++ b/include/fcntl.h +@@ -296,6 +296,26 @@ int name_to_handle_at(int dirfd, const char *pathname, + int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); + #endif + ++#ifdef __USE_GNU ++# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ ++# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ ++/* Owner types. */ ++enum __pid_type ++ { ++ F_OWNER_TID = 0, /* Kernel thread. */ ++ F_OWNER_PID, /* Process. */ ++ F_OWNER_PGRP, /* Process group. */ ++ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ ++ }; ++ ++/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ ++struct f_owner_ex ++ { ++ enum __pid_type type; /* Owner type of ID. */ ++ __pid_t pid; /* ID of owner. */ ++ }; ++#endif ++ + __END_DECLS + + #endif /* fcntl.h */ +diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h +index c143ba9c9..dbe929351 100644 +--- a/libc/sysdeps/linux/aarch64/bits/fcntl.h ++++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h +@@ -94,8 +94,6 @@ + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ + #endif + + +@@ -170,25 +168,6 @@ struct flock64 + }; + #endif + +- +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_PGRP, /* Process group. */ +- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +-- +2.30.2 + diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index cdca75b113..8d87c04383 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.43/uClibc-ng-1.0.43.tar.xz.sha256 -sha256 8c1f550f14728a9c06ff1fb3e85069f7f10f4d684b03e163f4d9d41727124047 uClibc-ng-1.0.43.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.44/uClibc-ng-1.0.44.tar.xz.sha256 +sha256 7df9d987955827382f1c2400da513456becbb6f868bdfd37737265f1cbeec994 uClibc-ng-1.0.44.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 80c9caf07f..4e7d8de643 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.43 +UCLIBC_VERSION = 1.0.44 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ diff --git a/package/util-linux/0001-libmount-ifdef-statx-call.patch b/package/util-linux/0001-libmount-ifdef-statx-call.patch new file mode 100644 index 0000000000..ba44650bd3 --- /dev/null +++ b/package/util-linux/0001-libmount-ifdef-statx-call.patch @@ -0,0 +1,57 @@ +From c0136ac0c98b18208508fbcfac31a843e0bb8a37 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 3 Aug 2023 12:39:19 +0200 +Subject: [PATCH] libmount: ifdef statx() call + +In this case the statx() is use to get mount ID. It's optional and not +required. Let's #ifdef the statx() call and also check for stx_mnt_id +struct member. + +Fixes: https://github.com/util-linux/util-linux/issues/2415 +Signed-off-by: Karel Zak +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/util-linux/util-linux/commit/c0136ac0c98b18208508fbcfac31a843e0bb8a37 +--- + configure.ac | 5 ++++- + libmount/src/hook_mount.c | 2 ++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a3cf330b5..ae721c7ac 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -525,7 +525,10 @@ AC_CHECK_MEMBERS([struct termios.c_line],,, + [[#include ]]) + + AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec],,, +- [#include ]) ++ [[#include ]]) ++ ++AC_CHECK_MEMBERS([struct statx.stx_mnt_id],,, ++ [[#include ]]) + + AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include ]]) + +diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c +index d69a018ec..056338c49 100644 +--- a/libmount/src/hook_mount.c ++++ b/libmount/src/hook_mount.c +@@ -294,6 +294,7 @@ static int hook_create_mount(struct libmnt_context *cxt, + /* cleanup after fail (libmount may only try the FS type) */ + close_sysapi_fds(api); + ++#if defined(HAVE_STRUCT_STATX) && defined(HAVE_STRUCT_STATX_STX_MNT_ID) + if (!rc && cxt->fs) { + struct statx st; + +@@ -306,6 +307,7 @@ static int hook_create_mount(struct libmnt_context *cxt, + fs->id = cxt->fs->id; + } + } ++#endif + + done: + DBG(HOOK, ul_debugobj(hs, "create FS done [rc=%d, id=%d]", rc, cxt->fs ? cxt->fs->id : -1)); +-- +2.39.2 + diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4a40d5afec..73eda5c171 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -30,6 +30,10 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.LGPL-2.1-or-later UTIL_LINUX_CPE_ID_VENDOR = kernel + +# 0001-libmount-ifdef-statx-call.patch +UTIL_LINUX_AUTORECONF = YES + UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 4de8922e0d..b91f97bb34 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -42,6 +42,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libXinerama/Config.in source package/x11r7/xlib_libXmu/Config.in source package/x11r7/xlib_libXpm/Config.in + source package/x11r7/xlib_libXpresent/Config.in source package/x11r7/xlib_libXrandr/Config.in source package/x11r7/xlib_libXrender/Config.in source package/x11r7/xlib_libXres/Config.in diff --git a/package/x11r7/xlib_libXpresent/Config.in b/package/x11r7/xlib_libXpresent/Config.in new file mode 100644 index 0000000000..f6e2d93fab --- /dev/null +++ b/package/x11r7/xlib_libXpresent/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_XLIB_LIBXPRESENT + bool "libXpresent" + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XORGPROTO + help + X.Org Xpresent library diff --git a/package/x11r7/xlib_libXpresent/xlib_libXpresent.hash b/package/x11r7/xlib_libXpresent/xlib_libXpresent.hash new file mode 100644 index 0000000000..e7f6ac9e5a --- /dev/null +++ b/package/x11r7/xlib_libXpresent/xlib_libXpresent.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2022-October/003225.html +sha256 b964df9e5a066daa5e08d2dc82692c57ca27d00b8cc257e8e960c9f1cf26231b libXpresent-1.0.1.tar.xz +sha512 a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25 libXpresent-1.0.1.tar.xz + +# Locally calculated +sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING diff --git a/package/x11r7/xlib_libXpresent/xlib_libXpresent.mk b/package/x11r7/xlib_libXpresent/xlib_libXpresent.mk new file mode 100644 index 0000000000..4cb4fd193a --- /dev/null +++ b/package/x11r7/xlib_libXpresent/xlib_libXpresent.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# xlib_libXpresent +# +################################################################################ + +XLIB_LIBXPRESENT_VERSION = 1.0.1 +XLIB_LIBXPRESENT_SOURCE = libXpresent-$(XLIB_LIBXPRESENT_VERSION).tar.xz +XLIB_LIBXPRESENT_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPRESENT_LICENSE = MIT +XLIB_LIBXPRESENT_LICENSE_FILES = COPYING +XLIB_LIBXPRESENT_INSTALL_STAGING = YES + +XLIB_LIBXPRESENT_DEPENDENCIES = \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXfixes \ + xlib_libXrandr \ + xorgproto + +$(eval $(autotools-package)) diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index e174ac5397..e657c8086d 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -27,6 +27,10 @@ else XFSPROGS_CONF_OPTS += --disable-libicu endif +ifeq ($(BR2_OPTIMIZE_0),y) +XFSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" +endif + XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install $(eval $(autotools-package)) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index d14a68b402..cd23c8728d 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -9,5 +9,6 @@ YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING +YAJL_CPE_ID_VENDOR = yajl_project $(eval $(cmake-package)) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index 23ebfbdce9..4344221213 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -338,6 +338,8 @@ class Toolchain: m = re.match("^BR2_TOOLCHAIN_EXTERNAL_GCC_([0-9_]*)=y$", frag) assert m, "Cannot get gcc version for toolchain %s" % self.fname_prefix selects.append("BR2_TOOLCHAIN_GCC_AT_LEAST_%s" % m[1]) + # respect the GCC requirement for the selected CPU/arch tuning + depends.append("!BR2_ARCH_NEEDS_GCC_AT_LEAST_%s" % str(int(m[1]) + 1)) # kernel headers version if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HEADERS_"): diff --git a/support/testing/tests/package/test_nftables.py b/support/testing/tests/package/test_nftables.py new file mode 100644 index 0000000000..142e7d0352 --- /dev/null +++ b/support/testing/tests/package/test_nftables.py @@ -0,0 +1,109 @@ +import os + +import infra.basetest + + +class TestNftables(infra.basetest.BRTest): + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.46" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_NFTABLES=y + BR2_PACKAGE_PYTHON3=y + BR2_ROOTFS_OVERLAY="{}" + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + infra.filepath("tests/package/test_nftables/rootfs-overlay")) + + def nftables_test(self, prog="nft"): + # Table/Chain names for the test + nft_table = "br_ip_table" + nft_chain = "br_ip_chain_in" + + # We flush all nftables rules, to start from a known state. + self.assertRunOk(f"{prog} flush ruleset") + + # We create an ip table. + self.assertRunOk(f"{prog} add table ip {nft_table}") + + # We should be able to list this table. + list_cmd = f"{prog} list tables ip" + output, exit_code = self.emulator.run(list_cmd) + self.assertEqual(exit_code, 0) + self.assertIn(nft_table, output[0]) + + # We create an ip input chain in our table. + cmd = f"{prog} add chain ip" + cmd += f" {nft_table} {nft_chain}" + cmd += " { type filter hook input priority 0 \\; }" + self.assertRunOk(cmd) + + # We list our chain. + cmd = f"{prog} list chain ip {nft_table} {nft_chain}" + self.assertRunOk(cmd) + + # We add a filter rule to drop pings (icmp echo-requests) to + # the 127.0.0.2 destination. + cmd = f"{prog} add rule ip {nft_table} {nft_chain}" + cmd += " ip daddr 127.0.0.2 icmp type echo-request drop" + self.assertRunOk(cmd) + + # We list our rule. + self.assertRunOk(f"{prog} list ruleset ip") + + # A ping to 127.0.0.1 is expected to work, because it's not + # matching our rule. We expect 3 replies (-c), with 0.5s + # internal (-i), and set a maximum timeout of 2s. + ping_cmd_prefix = "ping -c 3 -i 0.5 -W 2 " + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + + # A ping to 127.0.0.2 is expected to fail, because our rule is + # supposed to drop it. + ping_test_cmd = ping_cmd_prefix + "127.0.0.2" + _, exit_code = self.emulator.run(ping_test_cmd) + self.assertNotEqual(exit_code, 0) + + # We completely delete the table. This should also delete the + # chain and the rule. + self.assertRunOk(f"{prog} delete table ip {nft_table}") + + # We should no longer see the table in the list. + output, exit_code = self.emulator.run(list_cmd) + self.assertEqual(exit_code, 0) + self.assertNotIn(nft_table, "\n".join(output)) + + # Since we deleted the rule, the ping test command which was + # supposed to fail earlier is now supposed to succeed. + self.assertRunOk(ping_test_cmd) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # We check the program can execute. + self.assertRunOk("nft --version") + + # We run the nftables test sequence using the default "nft" + # user space configuration tool. + self.nftables_test() + + # We run again the same test sequence using our simple nft + # python implementation, to check the language bindings. + self.nftables_test(prog="/root/nft.py") diff --git a/support/testing/tests/package/test_nftables/rootfs-overlay/root/nft.py b/support/testing/tests/package/test_nftables/rootfs-overlay/root/nft.py new file mode 100755 index 0000000000..89de8e25d1 --- /dev/null +++ b/support/testing/tests/package/test_nftables/rootfs-overlay/root/nft.py @@ -0,0 +1,22 @@ +#! /usr/bin/env python3 +# +# This is a simple reimplementation of the "nft" user-space tool in +# Python, in order to test language bindings. It does not support any +# command line argument supported by the nftables "nft" tool, but +# supports all nftables commands used in the Buildroot runtime test. + +import sys + +import nftables + + +nft = nftables.nftables.Nftables() +cmd = " ".join(sys.argv[1:]) +ret_code, output, error = nft.cmd(cmd) + +if len(output) > 0: + print(output.strip()) +if len(error) > 0: + print(error.strip()) + +sys.exit(ret_code) diff --git a/support/testing/tests/package/test_polkit.py b/support/testing/tests/package/test_polkit.py index 3da63c437b..3414fd5159 100644 --- a/support/testing/tests/package/test_polkit.py +++ b/support/testing/tests/package/test_polkit.py @@ -44,7 +44,7 @@ class TestPolkitSystemd(TestPolkitInfra): for rule_path in TestPolkitInfra.rule_paths: cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'" _, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 1) + self.assertNotEqual(exit_code, 0) cmd = "cp /root/{file} {path}".format(file=rule_file, path=rule_path) _, exit_code = self.emulator.run(cmd, 10) diff --git a/toolchain/Config.in b/toolchain/Config.in index a142d27231..da6bf5f4c8 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -77,6 +77,12 @@ config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 bool default y if BR2_nios2 +# https://sourceware.org/bugzilla/show_bug.cgi?id=30730 +# Affect toolchains built with binutils 2.40, still not fixed. +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 + bool + default y if BR2_m68k_cf + # Atomic types can be: # - never lock-free # - sometimes lock-free @@ -244,6 +250,24 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_OPTIMIZE_0 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 +# ICE: on M68K: in change_address_1, at emit-rtl.cc:2287 +# This bug exists in gcc = 12.3.0 and gcc = 13.2.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_110934 + bool + default y if BR2_m68k + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111001 +# ICE: on SH4: during RTL pass: sh_treg_combine2 +# This bug exist in gcc = 13.2.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_111001 + bool + default y if BR2_sh + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on BR2_OPTIMIZE_1 || \ + BR2_OPTIMIZE_2 || \ + BR2_OPTIMIZE_3 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool 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 62e5ea8667..466b1587c3 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE bool "Arm AArch64 BE 12.2.rel1" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 0c2e64192d..fc62b759e5 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 bool "Arm AArch64 12.2.rel1" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 4aab41693d..9b314795cb 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -9,6 +9,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM depends on BR2_ARM_CPU_HAS_NEON depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "aarch64" depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index e1867ee690..eb6ed5a865 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -84,6 +84,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE bool "aarch64 glibc stable 2023.08-1" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -132,6 +133,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE bool "aarch64 musl stable 2023.08-1" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 @@ -179,6 +181,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE bool "aarch64 uclibc stable 2023.08-1" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -227,6 +230,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE bool "aarch64be glibc stable 2023.08-1" depends on BR2_aarch64_be + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -275,6 +279,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE bool "aarch64be musl stable 2023.08-1" depends on BR2_aarch64_be + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 @@ -322,6 +327,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE bool "aarch64be uclibc stable 2023.08-1" depends on BR2_aarch64_be + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -371,6 +377,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE bool "arcle-750d uclibc stable 2023.08-1" depends on BR2_arcle depends on BR2_arc750d + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -419,6 +426,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE bool "arcle-hs38 glibc stable 2023.08-1" depends on BR2_arcle depends on BR2_archs38 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -467,6 +475,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE bool "arcle-hs38 uclibc stable 2023.08-1" depends on BR2_arcle depends on BR2_archs38 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -518,6 +527,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -570,6 +580,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -622,6 +633,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -674,6 +686,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -726,6 +739,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -778,6 +792,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -830,6 +845,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -882,6 +898,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -934,6 +951,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -986,6 +1004,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1038,6 +1057,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1090,6 +1110,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -1138,6 +1159,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE bool "armv7m uclibc stable 2023.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -1184,6 +1206,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE bool "m68k-68xxx uclibc stable 2023.08-1" depends on BR2_m68k_m68k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -1230,6 +1253,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE bool "m68k-coldfire uclibc stable 2023.08-1" depends on BR2_m68k_cf + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -1275,6 +1299,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE bool "microblazebe glibc stable 2023.08-1" depends on BR2_microblazebe + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -1321,6 +1346,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE bool "microblazebe musl stable 2023.08-1" depends on BR2_microblazebe + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -1368,6 +1394,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE bool "microblazebe uclibc stable 2023.08-1" depends on BR2_microblazebe + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1415,6 +1442,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE bool "microblazeel glibc stable 2023.08-1" depends on BR2_microblazeel + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -1461,6 +1489,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE bool "microblazeel musl stable 2023.08-1" depends on BR2_microblazeel + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -1508,6 +1537,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE bool "microblazeel uclibc stable 2023.08-1" depends on BR2_microblazeel + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1560,6 +1590,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1612,6 +1643,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1663,6 +1695,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -1715,6 +1748,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1767,6 +1801,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1818,6 +1853,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -1870,6 +1906,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1922,6 +1959,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -1974,6 +2012,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -2026,6 +2065,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2078,6 +2118,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2130,6 +2171,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -2184,6 +2226,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2238,6 +2281,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2292,6 +2336,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -2346,6 +2391,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2400,6 +2446,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2454,6 +2501,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -2508,6 +2556,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2562,6 +2611,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2616,6 +2666,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -2664,6 +2715,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE bool "nios2 glibc stable 2023.08-1" depends on BR2_nios2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2713,6 +2765,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE bool "openrisc glibc stable 2023.08-1" depends on BR2_or1k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -2763,6 +2816,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE bool "openrisc musl stable 2023.08-1" depends on BR2_or1k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -2812,6 +2866,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE bool "openrisc uclibc stable 2023.08-1" depends on BR2_or1k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2863,6 +2918,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE bool "powerpc-440fp glibc stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2912,6 +2968,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE bool "powerpc-440fp musl stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -2961,6 +3018,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE bool "powerpc-440fp uclibc stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -3011,6 +3069,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE bool "powerpc-e300c3 glibc stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3060,6 +3119,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE bool "powerpc-e300c3 musl stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3109,6 +3169,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE bool "powerpc-e300c3 uclibc stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -3159,6 +3220,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE bool "powerpc-e500mc glibc stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3208,6 +3270,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE bool "powerpc-e500mc musl stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3257,6 +3320,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE bool "powerpc-e500mc uclibc stable 2023.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -3307,6 +3371,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE bool "powerpc64-e5500 glibc stable 2023.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3357,6 +3422,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE bool "powerpc64-e6500 glibc stable 2023.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3407,6 +3473,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE bool "powerpc64-e6500 musl stable 2023.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3457,6 +3524,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE bool "powerpc64-power8 glibc stable 2023.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3507,6 +3575,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE bool "powerpc64-power8 musl stable 2023.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3557,6 +3626,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE bool "powerpc64le-power8 glibc stable 2023.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3607,6 +3677,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE bool "powerpc64le-power8 musl stable 2023.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3689,6 +3760,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP @@ -3743,6 +3815,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP @@ -3798,6 +3871,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR @@ -3848,6 +3922,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE bool "s390x-z13 glibc stable 2023.08-1" depends on BR2_s390x depends on BR2_s390x_z13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3898,6 +3973,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE bool "sh-sh4 glibc stable 2023.08-1" depends on BR2_sh depends on BR2_sh4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3948,6 +4024,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE bool "sh-sh4 musl stable 2023.08-1" depends on BR2_sh depends on BR2_sh4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -3997,6 +4074,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE bool "sh-sh4 uclibc stable 2023.08-1" depends on BR2_sh depends on BR2_sh4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -4047,6 +4125,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE bool "sh-sh4aeb glibc stable 2023.08-1" depends on BR2_sh depends on BR2_sh4aeb + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4097,6 +4176,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE bool "sh-sh4aeb musl stable 2023.08-1" depends on BR2_sh depends on BR2_sh4aeb + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4146,6 +4226,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE bool "sparc64 glibc stable 2023.08-1" depends on BR2_sparc64 depends on BR2_sparc_v9 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4171,6 +4252,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE bool "sparcv8 uclibc bleeding-edge 2022.08-2" depends on BR2_sparc depends on BR2_sparc_v8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR @@ -4196,6 +4278,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE bool "sparcv8 uclibc stable 2022.08-1" depends on BR2_sparc depends on BR2_sparc_v8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR @@ -4250,6 +4333,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4304,6 +4388,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4357,6 +4442,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -4419,6 +4505,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4481,6 +4568,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4542,6 +4630,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -4608,6 +4697,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4674,6 +4764,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4739,6 +4830,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -4807,6 +4899,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4875,6 +4968,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -4942,6 +5036,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -5004,6 +5099,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -5066,6 +5162,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -5128,6 +5225,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -5186,6 +5284,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -5243,6 +5342,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -5299,6 +5399,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -5363,6 +5464,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -5426,6 +5528,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 @@ -5488,6 +5591,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR @@ -5540,6 +5644,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 select BR2_USE_WCHAR diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 2341d08832..d49c610237 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index 8217ddc38c..720d705d14 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index d82c9b8a41..0f4f5eef2e 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -52,66 +52,82 @@ config BR2_TOOLCHAIN_EXTERNAL_GCC_13 config BR2_TOOLCHAIN_EXTERNAL_GCC_12 bool "12.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 config BR2_TOOLCHAIN_EXTERNAL_GCC_11 bool "11.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 config BR2_TOOLCHAIN_EXTERNAL_GCC_10 bool "10.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 config BR2_TOOLCHAIN_EXTERNAL_GCC_9 bool "9.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_GCC_AT_LEAST_9 config BR2_TOOLCHAIN_EXTERNAL_GCC_8 bool "8.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_9 select BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_TOOLCHAIN_EXTERNAL_GCC_7 bool "7.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_6 bool "6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_TOOLCHAIN_EXTERNAL_GCC_5 bool "5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 bool "4.9.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 bool "4.8.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_7 bool "4.7.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_6 bool "4.6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_5 bool "4.5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_4 bool "4.4.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 bool "4.3.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 config BR2_TOOLCHAIN_EXTERNAL_GCC_OLD bool "older" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 help Use this option if your GCC version is older than any of the above. diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in index 53d5dfd8f2..295a8987f1 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in @@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE bool "Linaro AArch64 BE 2018.05" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index c9b84b1d30..1b0ec7cd9f 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 bool "Linaro AArch64 2018.05" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index 015e92f17c..8b3b4c844e 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -8,6 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index b338a72bff..b143ee5e24 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -8,6 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index c3483f331c..985e7b1710 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC bool "Synopsys ARC 2019.09 toolchain" depends on BR2_arc depends on BR2_HOSTARCH = "x86_64" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP select BR2_ENABLE_LOCALE diff --git a/utils/checksymbolslib/test_makefile.py b/utils/checksymbolslib/test_makefile.py index 14d07eaa45..1dc6564b2f 100644 --- a/utils/checksymbolslib/test_makefile.py +++ b/utils/checksymbolslib/test_makefile.py @@ -247,9 +247,6 @@ check_filename = [ ('arch/arch.mk.riscv', 'arch/arch.mk.riscv', True), - ('boot/lpc32xxcdl/lpc32xxcdl.mk', - 'boot/lpc32xxcdl/lpc32xxcdl.mk', - True), ('fs/cramfs/cramfs.mk', 'fs/cramfs/cramfs.mk', True), diff --git a/utils/genrandconfig b/utils/genrandconfig index 60922e871c..52edad06d8 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -496,10 +496,6 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: return False - if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ - 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: - return False - if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: @@ -530,6 +526,12 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n') configlines.append('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=41610\n') + if 'BR2_TARGET_ROOTFS_UBI=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n')