diff --git a/.checkpackageignore b/.checkpackageignore index 9ef65e8724..efccc47a6c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -290,7 +290,6 @@ package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch lib_patch.Sob lib_patch.Upst package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch lib_patch.Sob lib_patch.Upstream package/curlftpfs/0003-nocache-memleak-fix.patch lib_patch.Sob lib_patch.Upstream package/curlftpfs/0004-fix-musl-build-off-t.patch lib_patch.Upstream -package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch lib_patch.Upstream package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch lib_patch.Upstream package/cwiid/0002-configure-make-wmgui-build-optional.patch lib_patch.Upstream package/dahdi-tools/0001-no-build-docs.patch lib_patch.Upstream @@ -403,7 +402,6 @@ package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch lib_patch.Upstream package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream package/gdb/14.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream @@ -445,7 +443,6 @@ package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream -package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream @@ -533,7 +530,6 @@ package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch lib_patch.Upstream -package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch lib_patch.Upstream package/libcuefile/0001-fix-static-link.patch lib_patch.Upstream package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch lib_patch.Upstream package/libdnet/0001-python-makefile.patch lib_patch.Upstream @@ -840,8 +836,6 @@ package/pifmrds/0001-Makefile-cross-compile-friendly.patch lib_patch.Upstream package/pifmrds/0002-Makefile-use-LDFLAGS.patch lib_patch.Upstream package/pifmrds/0003-Makefile-fix-static-link.patch lib_patch.Upstream package/pigpio/S50pigpio Shellcheck lib_sysv.Variables -package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch lib_patch.Upstream -package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch lib_patch.Upstream package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch lib_patch.Upstream package/pkgconf/pkg-config.in Shellcheck package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 64151b2f44..b2adbc2277 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,21 @@ endif ############################################################################### +comment "Legacy options removed in 2026.02" + +config BR2_PACKAGE_MESA3D_VDPAU + bool "mesa3d Gallium VDPAU state tracker support removed" + select BR2_LEGACY + help + Mesa3d removed the Gallium VDPAU state tracker. + +config BR2_BINUTILS_VERSION_2_42_X + bool "binutils 2.42 has been removed" + select BR2_LEGACY + help + binutils 2.42 has been removed, select a newer version + instead. + comment "Legacy options removed in 2025.11" config BR2_KERNEL_HEADERS_5_4 diff --git a/DEVELOPERS b/DEVELOPERS index 5c9eb94f56..1b27df9beb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1132,6 +1132,7 @@ F: package/cpulimit/ N: Florian Larysch F: package/casync-nano/ +F: package/sigsum-go/ N: Floris Bos F: package/ipmitool/ @@ -2260,9 +2261,11 @@ N: Marcus Hoffmann F: package/nethogs/ F: package/pico-sdk/ F: package/picotool/ +F: package/python-annotated-doc/ F: package/python-apscheduler/ F: package/python-crc/ F: package/python-django/ +F: package/python-gpiod/ F: package/python-immutabledict/ F: package/python-jc/ F: package/python-log-rate-limit/ @@ -2481,6 +2484,7 @@ F: package/libgudev/ N: Neal Frager F: board/versal/ +F: board/versal2/ F: board/xilinx/ F: board/zynq/ F: board/zynqmp/ @@ -2489,6 +2493,7 @@ F: boot/xilinx-prebuilt/ F: configs/versal_vck190_defconfig F: configs/versal_vek280_defconfig F: configs/versal_vpk180_defconfig +F: configs/versal2_vek385_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig F: configs/zynqmp_kria_kd240_defconfig diff --git a/board/arm/fvp-ebbr/fvp-config.txt b/board/arm/fvp-ebbr/fvp-config.txt index 61e040015b..5c68bb638e 100644 --- a/board/arm/fvp-ebbr/fvp-config.txt +++ b/board/arm/fvp-ebbr/fvp-config.txt @@ -1,6 +1,10 @@ # Arm A-Profile Base RevC AEM FVP config bp.secure_memory=1 +bp.terminal_1.start_telnet=0 bp.ve_sysregs.exit_on_shutdown=1 +bp.virtio_net.enabled=1 +bp.virtio_net.hostbridge.userNetworking=1 +bp.vis.rate_limit-enable=1 cache_state_modelled=0 cluster0.NUM_CORES=4 cluster0.cpu0.enable_crc32=1 diff --git a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8b77e1f165..b52b00722f 100644 --- a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz +sha256 a899100d9d92ceb1290fd4d61f5dd3b8af6b0e937cebc3c711cb514ac5acfaed arm-trusted-firmware-v2.14.0-git4.tar.gz diff --git a/board/arm/fvp-ebbr/patches/linux/linux.hash b/board/arm/fvp-ebbr/patches/linux/linux.hash index 20941a269b..a4cc7bd3f6 100644 --- a/board/arm/fvp-ebbr/patches/linux/linux.hash +++ b/board/arm/fvp-ebbr/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b linux-6.18.tar.xz diff --git a/board/arm/fvp-ebbr/patches/optee-client/optee-client.hash b/board/arm/fvp-ebbr/patches/optee-client/optee-client.hash new file mode 100644 index 0000000000..6c61615dbe --- /dev/null +++ b/board/arm/fvp-ebbr/patches/optee-client/optee-client.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 464b3bf5bc4a61830357dbf81a0e5b89414d3bca1c2a752570cb0e40d2f1e637 optee-client-4.8.0.tar.gz diff --git a/board/arm/fvp-ebbr/patches/optee-os/0001-plat-vexpress-redirect-console-to-uart0.patch b/board/arm/fvp-ebbr/patches/optee-os/0001-plat-vexpress-redirect-console-to-uart0.patch new file mode 100644 index 0000000000..aa61594088 --- /dev/null +++ b/board/arm/fvp-ebbr/patches/optee-os/0001-plat-vexpress-redirect-console-to-uart0.patch @@ -0,0 +1,34 @@ +From 1debd0c8bd46255f8c22b128ec16586ef9154869 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 2 Dec 2025 15:53:23 +0100 +Subject: [PATCH] plat-vexpress: redirect console to uart0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For consistency with TF-A, U-Boot and Linux. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + core/arch/arm/plat-vexpress/platform_config.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/arch/arm/plat-vexpress/platform_config.h b/core/arch/arm/plat-vexpress/platform_config.h +index 9231f3048..76c7fdb36 100644 +--- a/core/arch/arm/plat-vexpress/platform_config.h ++++ b/core/arch/arm/plat-vexpress/platform_config.h +@@ -23,8 +23,8 @@ + + #define IT_UART1 38 + +-#define CONSOLE_UART_BASE UART1_BASE +-#define IT_CONSOLE_UART IT_UART1 ++#define CONSOLE_UART_BASE UART0_BASE ++#undef IT_CONSOLE_UART + + #elif defined(PLATFORM_FLAVOR_juno) + +-- +2.51.0 + diff --git a/board/arm/fvp-ebbr/patches/optee-os/optee-os.hash b/board/arm/fvp-ebbr/patches/optee-os/optee-os.hash new file mode 100644 index 0000000000..80b30de9ea --- /dev/null +++ b/board/arm/fvp-ebbr/patches/optee-os/optee-os.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 5222cd553f5edb69ae4ec7cb99b2bfec2c47a47c0be1865b49744701918e8b4d optee-os-4.8.0.tar.gz diff --git a/board/arm/fvp-ebbr/patches/uboot/uboot.hash b/board/arm/fvp-ebbr/patches/uboot/uboot.hash index fe9b4f53dc..98a5c53aaf 100644 --- a/board/arm/fvp-ebbr/patches/uboot/uboot.hash +++ b/board/arm/fvp-ebbr/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/arm/fvp-ebbr/readme.txt b/board/arm/fvp-ebbr/readme.txt index fe7d4de5c5..6edfed20df 100644 --- a/board/arm/fvp-ebbr/readme.txt +++ b/board/arm/fvp-ebbr/readme.txt @@ -2,7 +2,7 @@ Introduction ============ The arm_fvp_ebbr_defconfig is meant to illustrate some aspects of the Arm EBBR -specification[1] and the Arm SystemReady IR[2] compliance program. +specification[1] and the Arm SystemReady Devicetree band[2]. It allows building an AArch64 U-Boot based firmware implementing the subset of UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to run on the Arm A-Profile Base RevC AEM FVP. @@ -26,8 +26,8 @@ Running on the FVP Download the FVP from one of the following sources, corresponding to your host computer: -- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz -- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz +- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.30/FVP_Base_RevC-2xAEMvA_11.30_27_Linux64.tgz +- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.30/FVP_Base_RevC-2xAEMvA_11.30_27_Linux64_armv8l.tgz The FVP will be located under one of the corresponding folders: @@ -53,21 +53,58 @@ supporting the EBBR specification. To run another OS on simulation using a live or pre-installed image, use the same FVP command line as for the generated OS but adapt the OS image path in the virtioblockdevice stanza. -The image generated by the aarch64_efi_defconfig or the Arm ACS-IR images[3] are -examples of pre-installed OS images. -Linux distributions such as Debian, Fedora, openSUSE or Ubuntu provide a -pre-installed OS image. +The image generated by the aarch64_efi_defconfig or the Arm ACS Devicetree +images[3] are examples of pre-installed OS images. +Linux distributions such as Debian, Fedora, openSUSE or Ubuntu, or FreeBSD +provide live or pre-installed OS image. + +Firmware details +================ + +Noteworthy firmware features: + +- TF-A, OP-TEE & U-Boot +- UEFI, with EFI variables stored on disk in the ESP +- Support for ethernet, RTC and LCD + +Architecture diagram: + + Non-Secure : Secure + : + +---------------------------+ : + EL0 | Busybox | : + +---------------------------+ : +--------+ + EL1 | Linux | : | OP-TEE | S-EL1 + +---------------------------+ : +--------+ + EL2 | U-Boot, GRUB, Linux (kvm) | : + +---------------------------+ : + ...................................: + +----------------------------------------+ + | TF-A | EL3 + +----------------------------------------+ + +Boot flow: + + TF-A -+-> OP-TEE + `-> U-Boot -> GRUB -> Linux -> Busybox + +TF-A BL1 loads the fit image with the remaining pieces of TF-A, OP-TEE and +U-Boot. +OP-TEE boots, calls back TF-A to go to normal world. +U-Boot loads GRUB with UEFI, boots Linux at EL2. + +In this configuration, the Devicetree is static and fully contained in TF-A. Miscellaneous ============= This configuration is inspired by the arm_foundationv8_defconfig, the -qemu_aarch64_virt_defconfig and the Arm SystemReady IR IoT Integration, Test, -and Certification Guide[4]. +qemu_aarch64_virt_defconfig and the Arm SystemReady Devicetree Band Integration +and Testing Guide[4]. -Firmware update, MMC and network are currently not supported. +Firmware update, GOP, MMC and RNG are currently not supported. -[1]: https://github.com/ARM-software/ebbr -[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR -[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images -[4]: https://developer.arm.com/documentation/DUI1101/latest/ +[1] https://github.com/ARM-software/ebbr +[2] https://www.arm.com/architecture/system-architectures/systemready-compliance-program/systemready-devicetree-band +[3] https://github.com/ARM-software/arm-systemready/tree/main/SystemReady-devicetree-band/prebuilt_images +[4] https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/board/arm/fvp-ebbr/u-boot.fragment b/board/arm/fvp-ebbr/u-boot.fragment index abbf8395be..37d98bcdf0 100644 --- a/board/arm/fvp-ebbr/u-boot.fragment +++ b/board/arm/fvp-ebbr/u-boot.fragment @@ -1,4 +1,4 @@ -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_ARM_SMCCC_FEATURES=y CONFIG_BOOTCOMMAND="bootflow scan -lb" CONFIG_BOOTMETH_DISTRO=y CONFIG_BOOTM_EFI=y @@ -17,8 +17,10 @@ CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y CONFIG_CMD_GETTIME=y CONFIG_CMD_GPT=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_POWEROFF=y CONFIG_CMD_RNG=y CONFIG_CMD_RTC=y +CONFIG_CMD_SMC=y CONFIG_CMD_TIME=y CONFIG_DM_RNG=y CONFIG_DM_RTC=y @@ -29,6 +31,7 @@ CONFIG_EFI_LOADER=y CONFIG_EFI_LOADER_HII=y CONFIG_EFI_MM_COMM_TEE=y CONFIG_EFI_PARTITION=y +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_SECURE_BOOT=y CONFIG_EFI_SET_TIME=y CONFIG_EFI_UNICODE_CAPITALIZATION=y diff --git a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash index c05084df76..7981c74137 100644 --- a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz +sha256 2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4 atf-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1028ardb/patches/linux/linux.hash b/board/freescale/ls1028ardb/patches/linux/linux.hash index 3aea05469c..f30030c86a 100644 --- a/board/freescale/ls1028ardb/patches/linux/linux.hash +++ b/board/freescale/ls1028ardb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz +sha256 27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b linux-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1028ardb/patches/uboot/uboot.hash b/board/freescale/ls1028ardb/patches/uboot/uboot.hash index 1072686160..38d54d9922 100644 --- a/board/freescale/ls1028ardb/patches/uboot/uboot.hash +++ b/board/freescale/ls1028ardb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz +sha256 2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785 u-boot-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1028ardb/readme.txt b/board/freescale/ls1028ardb/readme.txt index 28b8fdff3a..6411baf6ec 100644 --- a/board/freescale/ls1028ardb/readme.txt +++ b/board/freescale/ls1028ardb/readme.txt @@ -11,7 +11,7 @@ For more details about the board and the QorIQ Layerscape SoC, see the following Layerscape platforms are officially supported by NXP under the Layerscape Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project common with i.MX), but has a slower release cadence than LF. The currently used -tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in Buildroot, the latest Linux Factory release tag is always used, which may be considered pre-release software, as it may contain features which are not yet documented, and it generally undergoes less testing. @@ -21,11 +21,11 @@ For the software Layerscape Debian Linux SDK User Guide, see: - https://www.nxp.com/docs/en/user-guide/UG10143.pdf The components from NXP are: - - rcw, lf-6.12.20-2.0.0 - - atf (fork), lf-6.12.20-2.0.0 - - uboot (fork), lf-6.12.20-2.0.0 + - rcw, lf-6.12.34-2.1.0 + - atf (fork), lf-6.12.34-2.1.0 + - uboot (fork), lf-6.12.34-2.1.0 - cadence-dp-firmware (blob), 8.16 - - linux (fork), lf-6.12.20-2.0.0 + - linux (fork), lf-6.12.34-2.1.0 Build ===== diff --git a/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash index c05084df76..7981c74137 100644 --- a/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz +sha256 2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4 atf-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1043a-rdb/patches/linux/linux.hash b/board/freescale/ls1043a-rdb/patches/linux/linux.hash index 3aea05469c..f30030c86a 100644 --- a/board/freescale/ls1043a-rdb/patches/linux/linux.hash +++ b/board/freescale/ls1043a-rdb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz +sha256 27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b linux-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash b/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash index 1072686160..38d54d9922 100644 --- a/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash +++ b/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz +sha256 2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785 u-boot-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1043a-rdb/readme.txt b/board/freescale/ls1043a-rdb/readme.txt index b106c96471..4461b18e73 100644 --- a/board/freescale/ls1043a-rdb/readme.txt +++ b/board/freescale/ls1043a-rdb/readme.txt @@ -11,7 +11,7 @@ for more details about the board and the QorIQ Layerscape SoC, see the following Layerscape platforms are officially supported by NXP under the Layerscape Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project common with i.MX), but has a slower release cadence than LF. The currently used -tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in Buildroot, the latest Linux Factory release tag is always used, which may be considered pre-release software, as it may contain features which are not yet documented, and it generally undergoes less testing. @@ -21,13 +21,13 @@ For the software Layerscape Debian Linux SDK User Guide, see: - https://www.nxp.com/docs/en/user-guide/UG10143.pdf The components from NXP are: - - rcw, lf-6.12.20-2.0.0 - - atf (fork), lf-6.12.20-2.0.0 - - uboot (fork), lf-6.12.20-2.0.0 - - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 - - linux (fork), lf-6.12.20-2.0.0 - - fmlib, lf-6.12.20-2.0.0 - - fmc, lf-6.12.20-2.0.0 + - rcw, lf-6.12.34-2.1.0 + - atf (fork), lf-6.12.34-2.1.0 + - uboot (fork), lf-6.12.34-2.1.0 + - qoriq-fm-ucode (blob), lf-6.12.34-2.1.0 + - linux (fork), lf-6.12.34-2.1.0 + - fmlib, lf-6.12.34-2.1.0 + - fmc, lf-6.12.34-2.1.0 Build ===== diff --git a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash index c05084df76..7981c74137 100644 --- a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz +sha256 2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4 atf-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/linux/linux.hash b/board/freescale/ls1046a-frwy/patches/linux/linux.hash index 3aea05469c..f30030c86a 100644 --- a/board/freescale/ls1046a-frwy/patches/linux/linux.hash +++ b/board/freescale/ls1046a-frwy/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz +sha256 27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b linux-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash index 1072686160..38d54d9922 100644 --- a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash +++ b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz +sha256 2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785 u-boot-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/readme.txt b/board/freescale/ls1046a-frwy/readme.txt index 79a2ecdecf..57eb743d5a 100644 --- a/board/freescale/ls1046a-frwy/readme.txt +++ b/board/freescale/ls1046a-frwy/readme.txt @@ -12,7 +12,7 @@ For more details about the board and the QorIQ Layerscape SoC, see the following Layerscape platforms are officially supported by NXP under the Layerscape Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project common with i.MX), but has a slower release cadence than LF. The currently used -tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in Buildroot, the latest Linux Factory release tag is always used, which may be considered pre-release software, as it may contain features which are not yet documented, and it generally undergoes less testing. @@ -22,13 +22,13 @@ For the software Layerscape Debian Linux SDK User Guide, see: - https://www.nxp.com/docs/en/user-guide/UG10143.pdf The components from NXP are: - - rcw, lf-6.12.20-2.0.0 - - atf (fork), lf-6.12.20-2.0.0 - - uboot (fork), lf-6.12.20-2.0.0 - - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 - - linux (fork), lf-6.12.20-2.0.0 - - fmlib, lf-6.12.20-2.0.0 - - fmc, lf-6.12.20-2.0.0 + - rcw, lf-6.12.34-2.1.0 + - atf (fork), lf-6.12.34-2.1.0 + - uboot (fork), lf-6.12.34-2.1.0 + - qoriq-fm-ucode (blob), lf-6.12.34-2.1.0 + - linux (fork), lf-6.12.34-2.1.0 + - fmlib, lf-6.12.34-2.1.0 + - fmc, lf-6.12.34-2.1.0 Build ===== diff --git a/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash index c05084df76..7981c74137 100644 --- a/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz +sha256 2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4 atf-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1046a-rdb/patches/linux/linux.hash b/board/freescale/ls1046a-rdb/patches/linux/linux.hash index 3aea05469c..f30030c86a 100644 --- a/board/freescale/ls1046a-rdb/patches/linux/linux.hash +++ b/board/freescale/ls1046a-rdb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz +sha256 27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b linux-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash b/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash index 1072686160..38d54d9922 100644 --- a/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash +++ b/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz +sha256 2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785 u-boot-lf-6.12.34-2.1.0.tar.gz diff --git a/board/freescale/ls1046a-rdb/readme.txt b/board/freescale/ls1046a-rdb/readme.txt index ede7a607a8..e2f344dce9 100644 --- a/board/freescale/ls1046a-rdb/readme.txt +++ b/board/freescale/ls1046a-rdb/readme.txt @@ -11,7 +11,7 @@ for more details about the board and the QorIQ Layerscape SoC, see the following Layerscape platforms are officially supported by NXP under the Layerscape Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project common with i.MX), but has a slower release cadence than LF. The currently used -tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in Buildroot, the latest Linux Factory release tag is always used, which may be considered pre-release software, as it may contain features which are not yet documented, and it generally undergoes less testing. @@ -21,13 +21,13 @@ For the software Layerscape Debian Linux SDK User Guide, see: - https://www.nxp.com/docs/en/user-guide/UG10143.pdf The components from NXP are: - - rcw, lf-6.12.20-2.0.0 - - atf (fork), lf-6.12.20-2.0.0 - - uboot (fork), lf-6.12.20-2.0.0 - - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 - - linux (fork), lf-6.12.20-2.0.0 - - fmlib, lf-6.12.20-2.0.0 - - fmc, lf-6.12.20-2.0.0 + - rcw, lf-6.12.34-2.1.0 + - atf (fork), lf-6.12.34-2.1.0 + - uboot (fork), lf-6.12.34-2.1.0 + - qoriq-fm-ucode (blob), lf-6.12.34-2.1.0 + - linux (fork), lf-6.12.34-2.1.0 + - fmlib, lf-6.12.34-2.1.0 + - fmc, lf-6.12.34-2.1.0 Build ===== diff --git a/board/versal2/genimage.cfg b/board/versal2/genimage.cfg new file mode 120000 index 0000000000..3aa5543165 --- /dev/null +++ b/board/versal2/genimage.cfg @@ -0,0 +1 @@ +../versal/genimage.cfg \ No newline at end of file diff --git a/board/versal2/post-build.sh b/board/versal2/post-build.sh new file mode 120000 index 0000000000..0130ff23d2 --- /dev/null +++ b/board/versal2/post-build.sh @@ -0,0 +1 @@ +../zynqmp/post-build.sh \ No newline at end of file diff --git a/board/versal2/post-image.sh b/board/versal2/post-image.sh new file mode 100755 index 0000000000..17746271e1 --- /dev/null +++ b/board/versal2/post-image.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# By default U-Boot loads DTB from a file named "system.dtb", and +# with versal2, the Linux DTB is the same as the U-Boot DTB, so +# let's use a symlink since the DTB is the same. +ln -fs "${BINARIES_DIR}/u-boot.dtb" "${BINARIES_DIR}/system.dtb" + +BOARD_DIR="$(dirname "$0")" + +cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" + the_ROM_image: + { + image { + { type=bootimage, file=${BINARIES_DIR}/boot.pdi } + { type=bootloader, file=${BINARIES_DIR}/plm.elf } + { core=asu, file=${BINARIES_DIR}/asufw.elf } + } + image { + id = 0x1c000000, name=apu_subsystem + { type=raw, load=0x01000000, file=${BINARIES_DIR}/u-boot.dtb } + { core=a78-0, cluster=0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } + { core=a78-0, cluster=0, exception_level=el-1, trustzone, load=0x1800000, file=${BINARIES_DIR}/tee-raw.bin } + { core=a78-0, cluster=0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } + } + } + __HEADER_EOF + +"${HOST_DIR}/bin/bootgen" -arch versal_2ve_2vm -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/versal2/readme.txt b/board/versal2/readme.txt new file mode 100644 index 0000000000..4498392bcb --- /dev/null +++ b/board/versal2/readme.txt @@ -0,0 +1,182 @@ +This document describes the Buildroot support for the following +Xilinx Versal Gen2 boards: + +****************************************** +Supported Versal Gen2 Boards: +Xilinx VEK385 board +****************************************** + +Evaluation board features can be found here with the links below. + +VEK385: +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vek385.html + +How to build it +=============== + +Configure Buildroot: + + $ make versal2_vek385_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- asufw.elf + +-- bl31.elf + +-- boot.bin + +-- bootgen.bif + +-- boot.pdi + +-- boot.vfat + +-- extlinux.conf + +-- Image + +-- plm.elf + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- system.dtb -> u-boot.dtb + +-- tee-raw.bin + +-- u-boot.dtb + `-- u-boot.elf + +How to write the SD card +======================== + +WARNING! This will destroy all the card content. Use with care! + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to an SD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the SD. + +Eject the SD card, insert it in the board, and power it up. + +Support for other boards: +========================= + +If you want to build a system for other boards based on the same SoC, and the +board is already supported by the upstream kernel, U-Boot, and +xilinx-prebuilt, you simply need to change the following Buildroot options: + + - U-Boot (BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=") + - xilinx-prebuilt (BR2_TARGET_XILINX_PREBUILT_BOARD) + +Custom versal2 board support: + +To generate a boot.bin image, Versal2 boards require a PDI (Programmable Device +Image) generated by Xilinx Vivado which contains all the hardware specific +boot information, such as clock, MIO and DDR initializations as well as any +customizations in the programmable logic. Since this PDI can only be generated +by Xilinx Vivado, Buildroot needs access to the prebuilt image. The Buildroot +xilinx-prebuilt package has support for Versal2 XSA files exported from Xilinx +Vivado. + +Using the option BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA, Buildroot can obtain +the prebuilt PDI from the XSA file. + +1) Start with a defconfig supported by Buildroot (e.g. VEK385) + make versal2_vek385_defconfig + +2) make menuconfig + Visit the following menu and enable BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + + Bootloaders ---> + xilinx-prebuilt ---> + [*] download a prebuilt Versal XSA + +3) Within the same menuconfig, configure location of XSA. It can be in the + local file system or downloadable from an https:// location. + + Bootloaders ---> + xilinx-prebuilt ---> + () URL of custom XSA + +4) make + +The resulting output/images will contain a boot.bin that includes the custom +PDI file extracted from the Xilinx Vivado exported XSA file. + +How to write boot.bin to VEK385 OSPI boot flash +======================================================= + +The VEK385 cannot be configured to boot from the SD card directly because it +is connected to the 2VE3858 by a USB to SD card bridge and not connected +directly. For this reason, the boot.bin needs to be in the OSPI flash for +booting the first boot stage, and u-boot can then boot Linux and the file +system from the SD card. + +For writing the boot.bin file to the OSPI flash the first time, it is +recommended to use the board system controller with the instructions on the +wiki page below: +https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/2273738753/Versal+Evaluation+Board+-+System+Controller+-+Update+7 + +Once the first boot.bin has been flashed and the VEK385 is able to boot into +u-boot, u-boot can then be used for subsequent updates to the OSPI flash using +the instructions below. + +VEK385 U-Boot Flashing Instructions: + $ usb start + $ sf probe + $ fatload usb 0 0x40000000 boot.bin + $ sf erase 0x0 +$filesize + $ sf write 0x40000000 0x0 $filesize + +If a valid boot.bin is already in the OSPI flash, it is possible to boot the +Buildroot generated SD card image without updating the OSPI boot.bin image, so +this is an optional step when just updating Linux and the file system. + +IMPORTANT NOTES for the VEK385 +======================================================= + +1) The base-design.pdi on the https://github.com/Xilinx/soc-prebuilt-firmware +repo is designed for revB of the VEK385 and will not work properly on revA. +Users should either create their own Vivado XSA file if they have a revA +board, or make sure to get a VEK385 revB or newer board. + +2) The default u-boot bootcmd is not the distro_bootcmd that buildroot +expects. When booting for the first time, please stop the boot in u-boot +and run the following commands: + $ setenv bootcmd 'run distro_bootcmd' + $ saveenv + $ boot + +3) When using the 2025.2 release, the default u-boot env value for fdt_addr_r +is 0x21000000 which overlaps with the OS image causing the following boot +failure: + +Found /extlinux/extlinux.conf +Retrieving file: /extlinux/extlinux.conf +1: linux +Retrieving file: /Image +append: console="ttyAMA1,115200" root="/dev/sdd2" rw rootwait +Retrieving file: /system.dtb +## Flattened Device Tree blob at 21000000 + Booting using the fdt blob at 0x21000000 +ERROR: FDT image overlaps OS image (OS=20200000..21cf0000) +EXTLINUX FAILED: continuing... + +This will be fixed with 2026.1 and future releases, but for 2025.2, users +must run the following u-boot commands to change the default value. + $ setenv fdt_addr_r 0x31000000 + $ saveenv + +4) Depending on the device tree used, the USB->SD card interface may not be +probed as /dev/sdd as the probing order can vary based on the device tree +configuration. To deal with this, users will need to change the last +parameter of BR2_ROOTFS_POST_SCRIPT_ARGS to sda2, sdb2 or sdc2 depending on +which corresponds to their configuration's USB->SD card. + +For example, the default value in the versal2_vek385_defconfig: +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA1,115200 sdd2" + +If the USB->SD card interface probed first, this would need to be changed to: +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA1,115200 sda2" diff --git a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash index d7bd1e73ef..429f610a56 100644 --- a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d xlnx_rebase_v2.12_2025.1.tar.gz +sha256 ea59fbfb702857a24f96ee8e9cf04f997942db1de98f8406b7daf9dcc8f4e9ea xlnx_rebase_v2.12_2025.2.tar.gz diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash index 994d637d50..90feba3d62 100644 --- a/board/xilinx/patches/linux/linux.hash +++ b/board/xilinx/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ea55acf69bead3d4cf121de414cccfbe75a3c36465c93d9500cc00688d9b8d9d xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz +sha256 38aec9ce252ed6a0b64d294d4d58bf51e25b249eefb31b800a5ce62cb084298a xlnx_rebase_v6.12_LTS_2025.2.tar.gz diff --git a/board/xilinx/patches/optee-os/optee-os.hash b/board/xilinx/patches/optee-os/optee-os.hash new file mode 100644 index 0000000000..69bca84314 --- /dev/null +++ b/board/xilinx/patches/optee-os/optee-os.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3b8969a25815a0be84f34033827e5eb557e10f0f13ebabaee339461f8520ec72 xlnx_rebase_v4.5.0_2025.2.tar.gz diff --git a/board/xilinx/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash index 19192b182c..6ef11ef02c 100644 --- a/board/xilinx/patches/uboot/uboot.hash +++ b/board/xilinx/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93 xlnx_rebase_v2025.01_2025.1.tar.gz +sha256 8819cbebda739436d5d2fbdef578ec3c9b902f7edbe0ce4ed6f0ddf254fcf2a7 xlnx_rebase_v2025.01_2025.2.tar.gz diff --git a/boot/Config.in b/boot/Config.in index 08a6c8353d..d3e1b9c055 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -4,7 +4,7 @@ config BR2_TARGET_XILINX_FIRMWARE_ARCH_SUPPORTS # All Xilinx SoCs using this package are aarch64 only depends on BR2_aarch64 # only CPUs with corresponding firmwares: - depends on BR2_cortex_a53 || BR2_cortex_a72 + depends on BR2_cortex_a53 || BR2_cortex_a72 || BR2_cortex_a78 menu "Bootloaders" diff --git a/boot/xilinx-embeddedsw/Config.in b/boot/xilinx-embeddedsw/Config.in index 3826f2e18e..674238fd0a 100644 --- a/boot/xilinx-embeddedsw/Config.in +++ b/boot/xilinx-embeddedsw/Config.in @@ -1,5 +1,6 @@ comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-buildroot-elf" depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf" + depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf riscv32-buildroot-elf" depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT menuconfig BR2_TARGET_XILINX_EMBEDDEDSW @@ -21,11 +22,33 @@ if BR2_TARGET_XILINX_EMBEDDEDSW config BR2_TARGET_XILINX_EMBEDDEDSW_VERSION string "xilinx-embeddedsw version" - default "xilinx_v2025.1" + default "xilinx_v2025.2" help Release version of Xilinx/embeddedsw. Must be xilinx_v2023.1 or newer. +config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW + bool "versal2 asufw" + depends on BR2_cortex_a78 + help + Build versal2 asufw application from Xilinx/embeddedsw + repo. + + https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/asufw + Version must be xilinx_v2025.2 or newer. + +config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM + bool "versal2 plm" + depends on BR2_cortex_a78 + help + Build versal2 plm application from Xilinx/embeddedsw repo. + If selected, the xilinx-prebuilt package will not install + the plm.elf since it will come from the xilinx-embeddedsw + package. + + https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/versal_plm + Version must be xilinx_v2025.2 or newer. + config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM bool "versal plm" depends on BR2_cortex_a72 diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash b/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash deleted file mode 100644 index 0a42bab314..0000000000 --- a/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally calculated -sha256 867b7c7652f754d1a3d6edfe76e53223670e2b4c7e4144d4db1604403d68f616 xilinx-embeddedsw-xilinx_v2025.1.tar.gz - -# Locally calculated -sha256 fbee87edd32cf203fdd7925f0bab15c98e2dc1e0d61e70867f1190dc4a605b12 license.txt diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk index abcfee255d..5fb442ee2a 100644 --- a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk +++ b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk @@ -30,6 +30,38 @@ XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_CFLAGS = \ "-Os -flto -ffat-lto-objects $(XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS)" XILINX_EMBEDDEDSW_CFLAGS = "-Os -flto -ffat-lto-objects" +XILINX_EMBEDDEDSW_ASUFW_CFLAGS = "-O2 -ffat-lto-objects -fno-lto" + +ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW),y) +define XILINX_EMBEDDEDSW_BUILD_VERSAL2_ASUFW + $(MAKE) -C $(@D)/lib/sw_apps/asufw/src \ + COMPILER=$(HOST_DIR)/bin/riscv32-buildroot-elf-gcc \ + ARCHIVER=$(HOST_DIR)/bin/riscv32-buildroot-elf-gcc-ar \ + CC=$(HOST_DIR)/bin/riscv32-buildroot-elf-gcc \ + CFLAGS=$(XILINX_EMBEDDEDSW_ASUFW_CFLAGS) +endef + +define XILINX_EMBEDDEDSW_INSTALL_VERSAL2_ASUFW + $(INSTALL) -D -m 0755 $(@D)/lib/sw_apps/asufw/src/asufw.elf \ + $(BINARIES_DIR)/asufw.elf +endef +endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW + +ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM),y) +define XILINX_EMBEDDEDSW_BUILD_VERSAL2_PLM + $(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal_2ve_2vm \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS) +endef + +define XILINX_EMBEDDEDSW_INSTALL_VERSAL2_PLM + $(INSTALL) -D -m 0755 \ + $(@D)/lib/sw_apps/versal_plm/src/versal_2ve_2vm/plm.elf \ + $(BINARIES_DIR)/plm.elf +endef +endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y) define XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM @@ -77,12 +109,16 @@ endef endif # BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW define XILINX_EMBEDDEDSW_BUILD_CMDS + $(XILINX_EMBEDDEDSW_BUILD_VERSAL2_ASUFW) + $(XILINX_EMBEDDEDSW_BUILD_VERSAL2_PLM) $(XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM) $(XILINX_EMBEDDEDSW_BUILD_VERSAL_PSMFW) $(XILINX_EMBEDDEDSW_BUILD_ZYNQMP_PMUFW) endef define XILINX_EMBEDDEDSW_INSTALL_IMAGES_CMDS + $(XILINX_EMBEDDEDSW_INSTALL_VERSAL2_ASUFW) + $(XILINX_EMBEDDEDSW_INSTALL_VERSAL2_PLM) $(XILINX_EMBEDDEDSW_INSTALL_VERSAL_PLM) $(XILINX_EMBEDDEDSW_INSTALL_VERSAL_PSMFW) $(XILINX_EMBEDDEDSW_INSTALL_ZYNQMP_PMUFW) diff --git a/boot/xilinx-embeddedsw/xilinx_v2025.2/xilinx-embeddedsw.hash b/boot/xilinx-embeddedsw/xilinx_v2025.2/xilinx-embeddedsw.hash new file mode 100644 index 0000000000..77b4c2467c --- /dev/null +++ b/boot/xilinx-embeddedsw/xilinx_v2025.2/xilinx-embeddedsw.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 fb9a705a2974fa4d8d79142baea204d388389b9b37d6f26194b7b759f8978457 xilinx-embeddedsw-xilinx_v2025.2.tar.gz + +# Locally calculated +sha256 5ed583a37f9592d4bef73061f14f85c2ca70b8b7a12ffe1ef8ea808fbb764425 license.txt diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in index b218458ba5..7926b6cb9e 100644 --- a/boot/xilinx-prebuilt/Config.in +++ b/boot/xilinx-prebuilt/Config.in @@ -17,7 +17,7 @@ if BR2_TARGET_XILINX_PREBUILT config BR2_TARGET_XILINX_PREBUILT_VERSION string "prebuilt version" - default "xilinx_v2025.1_update1" + default "xilinx_v2025.2" help Release version of Xilinx firmware. Must be xilinx_v2023.1 or newer. @@ -26,6 +26,7 @@ choice bool "family variant" default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_PACKAGE_VERSAL_FIRMWARE # legacy default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_cortex_a72 + default BR2_TARGET_XILINX_PREBUILT_VERSAL2 if BR2_cortex_a78 default BR2_TARGET_XILINX_PREBUILT_ZYNQMP config BR2_TARGET_XILINX_PREBUILT_ZYNQMP @@ -40,14 +41,21 @@ config BR2_TARGET_XILINX_PREBUILT_VERSAL bool "versal" depends on BR2_cortex_a72 +config BR2_TARGET_XILINX_PREBUILT_VERSAL2 + bool "versal2" + depends on BR2_cortex_a78 + help + Version must be xilinx_v2025.2 or newer. + endchoice config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA bool "download a prebuilt Versal XSA" - depends on BR2_TARGET_XILINX_PREBUILT_VERSAL + depends on BR2_TARGET_XILINX_PREBUILT_VERSAL || BR2_TARGET_XILINX_PREBUILT_VERSAL2 help The Xilinx Support Archive (XSA) provides custom Xilinx firmware files generated by the AMD Vivado Design Suite. + This option applies to either versal or versal2. https://docs.amd.com/r/en-US/ug1400-vitis-embedded/Creating-a-Hardware-Design-XSA-File @@ -60,32 +68,37 @@ config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION file. This URL can use any protocol recognized by Buildroot, like http://, ftp://, file:// or scp://. - When pointing to a local XSA using file://, you may want to - use a make variable like $(TOPDIR) to reference the root of - the Buildroot tree. + When pointing to a local XSA using file:// or simply the + local path, you may want to use a make variable like + $(TOPDIR) to reference the root of the Buildroot tree. + + This option applies to either versal or versal2. endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA config BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI bool "install versal pld.pdi" - depends on BR2_TARGET_XILINX_PREBUILT_VERSAL + depends on BR2_TARGET_XILINX_PREBUILT_VERSAL || BR2_TARGET_XILINX_PREBUILT_VERSAL2 help When using the Versal Segmented Configuration, there is a pld.pdi file containing the FPGA bitstream which can be loaded at run-time. By enabling this option, the pld.pdi will be installed to the target /lib/firmware/xilinx dir. + This option applies to either versal or versal2. config BR2_TARGET_XILINX_PREBUILT_FAMILY string default "zynqmp" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP default "kria" if BR2_TARGET_XILINX_PREBUILT_KRIA default "versal" if BR2_TARGET_XILINX_PREBUILT_VERSAL + default "versal_2ve_2vm" if BR2_TARGET_XILINX_PREBUILT_VERSAL2 config BR2_TARGET_XILINX_PREBUILT_BOARD string "board name" default "zcu102" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP default "kr260" if BR2_TARGET_XILINX_PREBUILT_KRIA default "vck190" if BR2_TARGET_XILINX_PREBUILT_VERSAL + default "vek385" if BR2_TARGET_XILINX_PREBUILT_VERSAL2 help Name of Xilinx target board. Used for installing the appropriate firmware. diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash deleted file mode 100644 index 6879b88d83..0000000000 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally calculated -sha256 48fd698a16f79b9a828c35ca5b2b50fe832149d1a2938c94c0bb6a2e249b0bed xilinx-prebuilt-xilinx_v2025.1_update1.tar.gz - -# Locally calculated -sha256 7b2074b607264a07347e1a7ef0323229585942793469f34b2cf9628f7623e05f LICENSE diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index 95b656cdde..7433444924 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -10,6 +10,9 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) XILINX_PREBUILT_FILE = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION)) XILINX_PREBUILT_SITE = $(patsubst %/,%,$(dir $(XILINX_PREBUILT_FILE))) XILINX_PREBUILT_SOURCE = $(notdir $(XILINX_PREBUILT_FILE)) +ifeq ($(findstring ://,$(XILINX_PREBUILT_FILE)),) +XILINX_PREBUILT_SITE_METHOD = file +endif define XILINX_PREBUILT_EXTRACT_CMDS $(UNZIP) $(XILINX_PREBUILT_DL_DIR)/$(XILINX_PREBUILT_SOURCE) -d $(@D) endef @@ -26,16 +29,11 @@ XILINX_PREBUILT_BOARD = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_BOARD)) XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAMILY) -ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) +# Common Files for All Versal Families +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL)$(BR2_TARGET_XILINX_PREBUILT_VERSAL2),y) ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) # Supports either plm.elf or plmfw.elf filenames XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm*.elf -# Unlike the psmfw.elf file for Xilinx development boards, -# AMD Vivado Design Suite currently generates a file named psm_fw.elf. -# Future versions of AMD Vivado will generate a file named psmfw.elf, -# so to support current and future AMD Vivado versions, the filename -# psm*fw.elf is used. -XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf # We need the *.pdi glob, because the file has different names for the # different boards, and it has to be named boot.pdi when installed. # If Segmented Configuration is used, there will be two pdi files and we need @@ -63,7 +61,6 @@ endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA # Supports either plm.elf or plmfw.elf filenames XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm*.elf -XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf # We need the *.pdi glob, because the file has different names for the # different boards, and it has to be named boot.pdi when installed. # If Segmented Configuration is used, there will be two pdi files and we need @@ -91,11 +88,27 @@ endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y) +ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM),y) define XILINX_PREBUILT_INSTALL_VERSAL_PLM $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PLM) \ $(BINARIES_DIR)/plm.elf endef +endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL | BR2_TARGET_XILINX_PREBUILT_VERSAL2 + +# Files specific to Versal Gen1 +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) +# Unlike the psmfw.elf file for Xilinx development boards, +# AMD Vivado Design Suite currently generates a file named psm_fw.elf. +# Future versions of AMD Vivado will generate a file named psmfw.elf, +# so to support current and future AMD Vivado versions, the filename +# psm*fw.elf is used. +XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf +else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA +XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW),y) define XILINX_PREBUILT_INSTALL_VERSAL_PSMFW diff --git a/boot/xilinx-prebuilt/xilinx_v2025.2/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx_v2025.2/xilinx-prebuilt.hash new file mode 100644 index 0000000000..9828b6595e --- /dev/null +++ b/boot/xilinx-prebuilt/xilinx_v2025.2/xilinx-prebuilt.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 d292a52ac167631860b5e9a8d8356946289da164ddde4c5393977dc1652dcadb xilinx-prebuilt-xilinx_v2025.2.tar.gz + +# Locally calculated +sha256 e7ed8599c0cbf9e28d07883f94ee6ff694f6a702daa56c75b2cf4b30105baecc LICENSE diff --git a/configs/arm_fvp_ebbr_defconfig b/configs/arm_fvp_ebbr_defconfig index 5aa1727889..665f59c130 100644 --- a/configs/arm_fvp_ebbr_defconfig +++ b/configs/arm_fvp_ebbr_defconfig @@ -1,12 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/arm/fvp-ebbr/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arm/fvp-ebbr/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/arm/fvp-ebbr/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y @@ -17,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.14.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="fvp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/arm/fvp-ebbr/fvp-ebbr.dts" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y @@ -26,17 +30,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ARM_TSP_RAM_LOCATION=tdram FVP_DT_PREFIX=fvp-ebbr" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot efi_gop efifwsetup efinet efitextmode ext2 fat halt help linux lsefi lsefimmap lsefisystab minicmd normal part_gpt part_msdos reboot squash4" BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE="4.8.0" +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-fvp" -BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_ARM_GICV3=y" +BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_ARM_GICV3=y CFG_TEE_CORE_LOG_LEVEL=2 CFG_TEE_TA_LOG_LEVEL=2" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vexpress_fvp" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/arm/fvp-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index ccb886dbe9..d39c452963 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,11 +22,11 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -36,7 +36,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y diff --git a/configs/ls1043a-rdb_defconfig b/configs/ls1043a-rdb_defconfig index 57c9dbf5b1..94b8a91416 100644 --- a/configs/ls1043a-rdb_defconfig +++ b/configs/ls1043a-rdb_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1043a-rdb/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1043ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1043ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y diff --git a/configs/ls1046a-frwy_defconfig b/configs/ls1046a-frwy_defconfig index f12b27b817..838d132d55 100644 --- a/configs/ls1046a-frwy_defconfig +++ b/configs/ls1046a-frwy_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y diff --git a/configs/ls1046a-rdb_defconfig b/configs/ls1046a-rdb_defconfig index 21c63e43b4..f9be2d42b2 100644 --- a/configs/ls1046a-rdb_defconfig +++ b/configs/ls1046a-rdb_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-rdb/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y diff --git a/configs/versal2_vek385_defconfig b/configs/versal2_vek385_defconfig new file mode 100644 index 0000000000..9a70a6bcb2 --- /dev/null +++ b/configs/versal2_vek385_defconfig @@ -0,0 +1,55 @@ +BR2_aarch64=y +BR2_cortex_a78=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf riscv32-buildroot-elf" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_MULTILIB=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal2/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA1,115200 sdd2" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="VERSAL2_CONSOLE=cadence1" +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y +BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,optee_os,xlnx_rebase_v4.5.0_2025.2)/xlnx_rebase_v4.5.0_2025.2.tar.gz" +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y +BR2_TARGET_OPTEE_OS_PLATFORM="versal2" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="amd_versal2_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal2-vek385-revB" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_PACKAGE_HOST_BOOTGEN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 33d06ef963..f9256254f0 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/versal_vek280_defconfig b/configs/versal_vek280_defconfig index 07ab2f18af..222297b768 100644 --- a/configs/versal_vek280_defconfig +++ b/configs/versal_vek280_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vek280-revB" @@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig index 970823e571..020279c3b5 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" @@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index b7bf70efcd..d50e1ab818 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index f968ae1a08..a4afb61faa 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index fe40dc99aa..4f15fef813 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 53653036ba..c08dabadd4 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index 71b2547e69..95cb7ea50a 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index e0c002ea7a..00862b07b8 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index d80c47b4bc..bd7c43e2fa 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index a1ac800098..8e9cc3be36 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index bd8e8b0629..d425ee13c7 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index a964f28a9e..c8652d5502 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/package/Config.in b/package/Config.in index 83414b3e0b..22970b4d45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -992,6 +992,7 @@ menu "External python modules" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" source "package/python-aniso8601/Config.in" + source "package/python-annotated-doc/Config.in" source "package/python-annotated-types/Config.in" source "package/python-ansicolors/Config.in" source "package/python-anyio/Config.in" @@ -1136,6 +1137,7 @@ menu "External python modules" source "package/python-google-api-core/Config.in" source "package/python-google-auth/Config.in" source "package/python-googleapis-common-protos/Config.in" + source "package/python-gpiod/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-grpc-requests/Config.in" @@ -2790,6 +2792,7 @@ comment "Utilities" source "package/screen/Config.in" source "package/screenfetch/Config.in" source "package/sexpect/Config.in" + source "package/sigsum-go/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index f76d0ce36a..6357eec265 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -110,6 +110,7 @@ menu "Host utilities" source "package/sdbus-cpp/Config.in.host" source "package/sdbusplus/Config.in.host" source "package/sentry-cli/Config.in.host" + source "package/sigsum-go/Config.in.host" source "package/skopeo/Config.in.host" source "package/sloci-image/Config.in.host" source "package/snagboot/Config.in.host" diff --git a/package/acsccid/acsccid.hash b/package/acsccid/acsccid.hash index 25f894c577..eabce7d71e 100644 --- a/package/acsccid/acsccid.hash +++ b/package/acsccid/acsccid.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.12/ -sha1 6d9aa64b195e1b4d72a9b032f8ee70ad0798802d acsccid-1.1.12.tar.bz2 -md5 34bf40daedd3428c07f9937d4ec43129 acsccid-1.1.12.tar.bz2 +# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.13/ +md5 80a017891884863feccf2221a656d6b8 acsccid-1.1.13.tar.bz2 +sha1 35be7ee00b331fd7b4f9b718d39e4f43a1fca5c1 acsccid-1.1.13.tar.bz2 # Locally computed -sha256 28f6075a5494a568ce2fd8666c489f6f4a51599b44fbc9390e1ddb48d3ccc5bd acsccid-1.1.12.tar.bz2 +sha256 8b19aba103ec03c448b9d1b562c8322f8d2ff37cf21d4cb8b0cf522c5f385c9f acsccid-1.1.13.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/acsccid/acsccid.mk b/package/acsccid/acsccid.mk index 3be1379552..9c5e0b13dc 100644 --- a/package/acsccid/acsccid.mk +++ b/package/acsccid/acsccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACSCCID_VERSION = 1.1.12 +ACSCCID_VERSION = 1.1.13 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid ACSCCID_LICENSE = LGPL-2.1+ diff --git a/package/armadillo/armadillo.hash b/package/armadillo/armadillo.hash index 0a71218a30..adb21b66c7 100644 --- a/package/armadillo/armadillo.hash +++ b/package/armadillo/armadillo.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 a5b8109da3c169802f51a14d3bd1246395c24bbca55601760b0c96a3c0b2f8fa armadillo-15.2.1.tar.xz +sha256 8ee01cd4da55bc07b7bc7d3cba702ac6e8137d384d7e7185f3f4ae1f0c79704f armadillo-15.2.2.tar.xz # License files, locally calculated sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk index ee218dda34..cb83ee9e17 100644 --- a/package/armadillo/armadillo.mk +++ b/package/armadillo/armadillo.mk @@ -4,7 +4,7 @@ # ################################################################################ -ARMADILLO_VERSION = 15.2.1 +ARMADILLO_VERSION = 15.2.2 ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma ARMADILLO_INSTALL_STAGING = YES diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 780456dcaf..bcf3de9a44 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.58/at-spi2-core-2.58.1.sha256sum -sha256 7f374a6a38cd70ff4b32c9d3a0310bfa804d946fed4c9e69a7d49facdcb95e9c at-spi2-core-2.58.1.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.58/at-spi2-core-2.58.2.sha256sum +sha256 a2823b962ed16cdd5cb1fc5365029fd218394d852acd4098b321854bd6692f6e at-spi2-core-2.58.2.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f6d2b5264f..72703e923c 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -5,7 +5,7 @@ ################################################################################ AT_SPI2_CORE_VERSION_MAJOR = 2.58 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).2 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ diff --git a/package/azmq/azmq.hash b/package/azmq/azmq.hash index 6caf53582a..8b6c2c1f6b 100644 --- a/package/azmq/azmq.hash +++ b/package/azmq/azmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 80cfb951c5614b8c2e55a59ea2e5723a18ebed08da80e5420e525d6bf273771a azmq-1.0.3.tar.gz +sha256 6acd312b1358be23d65e0695f0c6ec176efef944af353961e99dfb777169a6b6 azmq-v1.0.3-54-g819b24035cfa5b73081e21f5867445f2344f680d.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE-BOOST_1_0 diff --git a/package/azmq/azmq.mk b/package/azmq/azmq.mk index a72b155664..99fb3212df 100644 --- a/package/azmq/azmq.mk +++ b/package/azmq/azmq.mk @@ -4,8 +4,8 @@ # ################################################################################ -AZMQ_VERSION = 1.0.3 -AZMQ_SITE = $(call github,zeromq,azmq,v$(AZMQ_VERSION)) +AZMQ_VERSION = v1.0.3-54-g819b24035cfa5b73081e21f5867445f2344f680d +AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION)) AZMQ_DEPENDENCIES = boost zeromq AZMQ_LICENSE = BSL-1.0 AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0 diff --git a/package/azure-iot-sdk-c/0001-Bump-cmake-version-and-update-dependencies.patch b/package/azure-iot-sdk-c/0001-Bump-cmake-version-and-update-dependencies.patch new file mode 100644 index 0000000000..7cef575532 --- /dev/null +++ b/package/azure-iot-sdk-c/0001-Bump-cmake-version-and-update-dependencies.patch @@ -0,0 +1,30 @@ +From 1a9a5fd688d811ca7300edccbdfc623fdaa1b8dc Mon Sep 17 00:00:00 2001 +From: Dan Cristoloveanu +Date: Wed, 27 Jan 2021 12:59:18 -0800 +Subject: [PATCH] Bump cmake version and update dependencies (#65) + +* Bump cmake version to 3.18 + +Upstream: https://github.com/Azure/macro-utils-c/commit/1a9a5fd688d811ca7300edccbdfc623fdaa1b8dc + +Signed-off-by: Bernd Kuhls +[backported to LTS_03_2025] +--- + deps/azure-macro-utils-c/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29b3416..3b82d4e 100644 +--- a/deps/azure-macro-utils-c/CMakeLists.txt ++++ b/deps/azure-macro-utils-c/CMakeLists.txt +@@ -1,7 +1,9 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + +-cmake_minimum_required(VERSION 2.8.11) ++if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION) ++ cmake_minimum_required(VERSION 3.18) ++endif() + + if(TARGET azure_macro_utils_c) + return() diff --git a/package/azure-iot-sdk-c/0002-Bump-cmake-version-and-update-dependencies.patch b/package/azure-iot-sdk-c/0002-Bump-cmake-version-and-update-dependencies.patch new file mode 100644 index 0000000000..c1076d70be --- /dev/null +++ b/package/azure-iot-sdk-c/0002-Bump-cmake-version-and-update-dependencies.patch @@ -0,0 +1,30 @@ +From 02ed1852d45fda6994748118bab129e5d2527c0f Mon Sep 17 00:00:00 2001 +From: Dan Cristoloveanu +Date: Wed, 27 Jan 2021 21:35:21 -0800 +Subject: [PATCH] Bump cmake version (#189) + +* Bump version for cmake + +Upstream: https://github.com/Azure/umock-c/commit/02ed1852d45fda6994748118bab129e5d2527c0f + +Signed-off-by: Bernd Kuhls +[backported to LTS_03_2025] +--- + deps/umock-c/CMakeLists.txt | 5 ++++- + 1 files change, 13 insertions(+), 74 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1a7a9f4..fc479cac 100644 +--- a/deps/umock-c/CMakeLists.txt ++++ b/deps/umock-c/CMakeLists.txt +@@ -1,7 +1,9 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + +-cmake_minimum_required(VERSION 2.8.11) ++if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION) ++ cmake_minimum_required(VERSION 3.18) ++endif() + + if(TARGET umock_c) + return() diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in index b0485ef957..5c2e507737 100644 --- a/package/bandwidthd/Config.in +++ b/package/bandwidthd/Config.in @@ -35,6 +35,7 @@ if BR2_PACKAGE_BANDWIDTHD config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL bool "enable postgresql log target support" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -48,9 +49,11 @@ config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL (github.com/nroach44/bandwidthd) for more information. comment "postgresql support needs a toolchain w/ dynamic library, wchar" + depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "postgresql support can't be built with Optimize for fast" + depends on !BR2_sparc depends on BR2_OPTIMIZE_FAST config BR2_PACKAGE_BANDWIDTHD_SQLITE3 diff --git a/package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch deleted file mode 100644 index 4753ae13c4..0000000000 --- a/package/binutils/2.42/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Fri, 16 Feb 2024 22:33:29 +1030 -Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 - -The assertion in nios2_elf32_install_imm16 triggers when the PLT is -twice the maximum allowable size for a branch from PLTn to reach -.PLTresolve, and on no other call to nios2_elf32_install_imm16. That -makes the assertion completely useless. We can handle a PIC PLT -exceeding 0x8000 in size by bouncing branches that won't reach through -previous branches. - - PR 27597 - * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. - (nios2_build_one_stub): Don't bother masking value passed to - nios2_elf32_install_imm16. - (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow - of PLTn branch to .PLTresolve by bouncing through prior branches. - -Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- - 1 file changed, 24 insertions(+), 16 deletions(-) - -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index bebf4239958..7f61e2f8507 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) - { - bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); - -- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); -- - bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), - sec->contents + offset); - } -@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U - nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, - hiadj (sym_value)); - nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, -- (sym_value & 0xffff)); -+ sym_value); - stub_sec->size += 12; - break; - default: -@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, - /* Emit the PLT entry. */ - if (bfd_link_pic (info)) - { -+ bfd_vma br_offset; -+ - nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, - 3); - plt_index = (h->plt.offset - 24) / 12; - got_offset = (plt_index + 3) * 4; - nios2_elf32_install_imm16 (splt, h->plt.offset, -- hiadj(plt_index * 4)); -+ hiadj (plt_index * 4)); - nios2_elf32_install_imm16 (splt, h->plt.offset + 4, -- (plt_index * 4) & 0xffff); -- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, -- 0xfff4 - h->plt.offset); -+ plt_index * 4); -+ br_offset = -(h->plt.offset + 12); -+ /* If this plt entry is too far away from the start of .plt -+ for the "br" to reach .PLTresolve, bounce through one or -+ more of the previous "br" instructions. */ -+ if (br_offset < (bfd_vma) -32768) -+ { -+ br_offset += 32768 / 12 * 12 - 4; -+ while (br_offset < (bfd_vma) -32768) -+ br_offset += 32768 / 12 * 12; -+ } -+ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); -+ - got_address = (sgotplt->output_section->vma + sgotplt->output_offset - + got_offset); - -@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, - nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); - got_address = (sgotplt->output_section->vma + sgotplt->output_offset - + got_offset); -- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); -- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, -- got_address & 0xffff); -+ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); -+ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); - - /* Fill in the entry in the global offset table. */ - bfd_put_32 (output_bfd, -@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - BFD_ASSERT ((got_pcrel & 0xf) == 0); - nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); - nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); -- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); -- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); -+ nios2_elf32_install_imm16 (splt, 12, got_pcrel); -+ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); - } - else - { -@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - - nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); - nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); -- nios2_elf32_install_imm16 (splt, res_size + 4, -- res_start & 0xffff); -+ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); - nios2_elf32_install_imm16 (splt, res_size + 12, - hiadj (got_address)); - nios2_elf32_install_imm16 (splt, res_size + 16, -- (got_address + 4) & 0xffff); -+ got_address + 4); - nios2_elf32_install_imm16 (splt, res_size + 20, -- (got_address + 8) & 0xffff); -+ got_address + 8); - } - } - } --- -2.34.1 - diff --git a/package/binutils/2.42/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch b/package/binutils/2.42/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch deleted file mode 100644 index f9b870afa2..0000000000 --- a/package/binutils/2.42/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 16 Nov 2024 05:03:52 +0000 -Subject: [PATCH] opcodes: fix -std=gnu23 compatibility wrt static_assert - -static_assert is declared in C23 so we can't reuse that identifier: -* Define our own static_assert conditionally; - -* Rename "static assert" hacks to _N as we do already in some places - to avoid a conflict. - -ChangeLog: - PR ld/32372 - - * i386-gen.c (static_assert): Define conditionally. - * mips-formats.h (MAPPED_INT): Rename identifier. - (MAPPED_REG): Rename identifier. - (OPTIONAL_MAPPED_REG): Rename identifier. - * s390-opc.c (static_assert): Define conditionally. - -Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 -Signed-off-by: Raphaël Mélotte ---- - opcodes/i386-gen.c | 2 ++ - opcodes/mips-formats.h | 6 +++--- - opcodes/s390-opc.c | 2 ++ - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c -index 053b66675c5..7ee8a30310c 100644 ---- a/opcodes/i386-gen.c -+++ b/opcodes/i386-gen.c -@@ -30,7 +30,9 @@ - - /* Build-time checks are preferrable over runtime ones. Use this construct - in preference where possible. */ -+#ifndef static_assert - #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) -+#endif - - static const char *program_name = NULL; - static int debug = 0; -diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h -index 90df7100803..c4dec6352bf 100644 ---- a/opcodes/mips-formats.h -+++ b/opcodes/mips-formats.h -@@ -49,7 +49,7 @@ - #define MAPPED_INT(SIZE, LSB, MAP, PRINT_HEX) \ - { \ - typedef char ATTRIBUTE_UNUSED \ -- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ -+ static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ - static const struct mips_mapped_int_operand op = { \ - { OP_MAPPED_INT, SIZE, LSB }, MAP, PRINT_HEX \ - }; \ -@@ -83,7 +83,7 @@ - #define MAPPED_REG(SIZE, LSB, BANK, MAP) \ - { \ - typedef char ATTRIBUTE_UNUSED \ -- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ -+ static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ - static const struct mips_reg_operand op = { \ - { OP_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ - }; \ -@@ -93,7 +93,7 @@ - #define OPTIONAL_MAPPED_REG(SIZE, LSB, BANK, MAP) \ - { \ - typedef char ATTRIBUTE_UNUSED \ -- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ -+ static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ - static const struct mips_reg_operand op = { \ - { OP_OPTIONAL_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ - }; \ -diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c -index 9d9f0973e55..49efd714157 100644 ---- a/opcodes/s390-opc.c -+++ b/opcodes/s390-opc.c -@@ -36,7 +36,9 @@ - - /* Build-time checks are preferrable over runtime ones. Use this construct - in preference where possible. */ -+#ifndef static_assert - #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) -+#endif - - #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) - --- -2.34.1 - diff --git a/package/binutils/2.42/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch b/package/binutils/2.42/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch deleted file mode 100644 index 2f75861434..0000000000 --- a/package/binutils/2.42/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch +++ /dev/null @@ -1,770 +0,0 @@ -From 0cec0418dacd30f4215d0d778b4e5d23f6a93801 Mon Sep 17 00:00:00 2001 -From: Vladimir Mezentsev -Date: Tue, 3 Sep 2024 21:30:31 -0700 -Subject: [PATCH] Fix 32097 Warnings when building gprofng with Clang - -gprofng/ChangeLog -2024-09-03 Vladimir Mezentsev . - - PR gprofng/32097 - * common/hwcdrv.c: Fix -Wempty-body warnings. - * common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings. - * common/hwctable.c: Fix -Wdeprecated-non-prototype warnings. - * libcollector/collector.c: Likewise. - * libcollector/collector.h: Likewise. - * libcollector/collectorAPI.c: Likewise. - * libcollector/dispatcher.c: Likewise. - * libcollector/iotrace.c: Likewise. - * libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings. - * libcollector/libcol_util.h: Remove unused declarations. - * libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings. - * src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings. - * src/Dbe.cc: Fix -Wself-assign warnings. - * src/DbeSession.cc: Fix -Wunused-but-set-variable warnings. - * src/Disasm.cc: Fix -Wunused-const-variable warnings. - * src/Experiment.cc: Fix -Wunused-private-field warnings. - * src/HashMap.h: Fix -Wself-assign warnings. - * src/IOActivity.h: Fix -Wunused-private-field warnings. - * src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings. - * src/collctrl.h: Fix -Wunused-private-field warnings. - * src/collector_module.h: Fix -Wdeprecated-non-prototype warnings. - * src/gp-display-src.cc: Fix -Wunused-private-field warnings. - * src/gp-print.h: Fix -Wheader-guard warnings. - * src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings. - * src/util.cc: Fix -Wunused-but-set-variable warnings. - -Upstream: b79c457ca01df82dbe1facb708e45def4584c903 -Signed-off-by: Thomas Petazzoni ---- - gprofng/common/hwcdrv.c | 3 ++- - gprofng/common/hwcentry.h | 7 +---- - gprofng/common/hwctable.c | 13 +--------- - gprofng/libcollector/collector.c | 15 ++++------- - gprofng/libcollector/collector.h | 2 +- - gprofng/libcollector/collectorAPI.c | 15 ++++++----- - gprofng/libcollector/dispatcher.c | 19 ++++++++------ - gprofng/libcollector/iotrace.c | 12 ++++----- - gprofng/libcollector/libcol_util.c | 2 -- - gprofng/libcollector/libcol_util.h | 6 ----- - gprofng/libcollector/linetrace.c | 40 +++++++++++++++++------------ - gprofng/src/BaseMetricTreeNode.h | 1 - - gprofng/src/Dbe.cc | 12 ++++----- - gprofng/src/DbeSession.cc | 3 --- - gprofng/src/Disasm.cc | 1 - - gprofng/src/Experiment.cc | 2 -- - gprofng/src/HashMap.h | 3 +-- - gprofng/src/IOActivity.h | 1 - - gprofng/src/collctrl.cc | 14 +++++----- - gprofng/src/collector_module.h | 20 +++++++-------- - gprofng/src/gp-display-src.cc | 8 ------ - gprofng/src/gp-print.h | 2 +- - gprofng/src/util.cc | 10 +++----- - 23 files changed, 84 insertions(+), 127 deletions(-) - -diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c -index 2d549b0d6a5..fa1ad32430b 100644 ---- a/gprofng/common/hwcdrv.c -+++ b/gprofng/common/hwcdrv.c -@@ -650,6 +650,7 @@ read_sample (counter_state_t *ctr_state, int msgsz, uint64_t *rvalue, - static void - dump_perf_event_attr (struct perf_event_attr *at) - { -+#if defined(DEBUG) - TprintfT (DBG_LT2, "dump_perf_event_attr: size=%d type=%d sample_period=%lld\n" - " config=0x%llx config1=0x%llx config2=0x%llx wakeup_events=%lld __reserved_1=%lld\n", - (int) at->size, (int) at->type, (unsigned long long) at->sample_period, -@@ -665,13 +666,13 @@ dump_perf_event_attr (struct perf_event_attr *at) - DUMP_F (exclude_kernel); - DUMP_F (exclude_hv); - DUMP_F (exclude_idle); -- // DUMP_F(xmmap); - DUMP_F (comm); - DUMP_F (freq); - DUMP_F (inherit_stat); - DUMP_F (enable_on_exec); - DUMP_F (task); - DUMP_F (watermark); -+#endif - } - - static void -diff --git a/gprofng/common/hwcentry.h b/gprofng/common/hwcentry.h -index a35a363e693..7899875cf96 100644 ---- a/gprofng/common/hwcentry.h -+++ b/gprofng/common/hwcentry.h -@@ -202,17 +202,12 @@ extern "C" - extern char *hwc_get_docref (char *buf, size_t buflen); - /* Return a CPU HWC document reference, or NULL. */ - -- // TBR -- extern char *hwc_get_default_cntrs (); -- /* Return a default HW counter string; may be NULL, or zero-length */ -- /* NULL means none is defined in the table; or zero-length means string defined could not be loaded */ -- - extern char *hwc_get_default_cntrs2 (int forKernel, int style); - /* like hwc_get_default_cntrs() for style==1 */ - /* but allows other styles of formatting as well */ - /* deprecate and eventually remove hwc_get_default_cntrs() */ - -- extern char *hwc_get_orig_default_cntrs (); -+ extern char *hwc_get_orig_default_cntrs (int forKernel); - /* Get the default HW counter string as set in the table */ - /* NULL means none is defined in the table */ - -diff --git a/gprofng/common/hwctable.c b/gprofng/common/hwctable.c -index d0735132fac..fe9153190e7 100644 ---- a/gprofng/common/hwctable.c -+++ b/gprofng/common/hwctable.c -@@ -3231,7 +3231,7 @@ check_tables () - } - #endif - --static int try_a_counter (); -+static int try_a_counter (int forKernel); - static void hwc_process_raw_ctrs (int forKernel, Hwcentry ***pstd_out, - Hwcentry ***praw_out, Hwcentry ***phidden_out, - Hwcentry**static_tables, -@@ -4321,17 +4321,6 @@ hwc_get_docref (char *buf, size_t buflen) - return buf; - } - --//TBR: -- --extern char* --hwc_get_default_cntrs () --{ -- setup_cpcx (); -- if (cpcx_default_hwcs[0] != NULL) -- return strdup (cpcx_default_hwcs[0]); // TBR deprecate this -- return NULL; --} -- - extern char* - hwc_get_default_cntrs2 (int forKernel, int style) - { -diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c -index 39529758600..ef580dcbdd9 100644 ---- a/gprofng/libcollector/collector.c -+++ b/gprofng/libcollector/collector.c -@@ -210,15 +210,10 @@ get_collector_interface () - static void - collector_module_init (CollectorInterface *col_intf) - { -- int nmodules = 0; -- - ModuleInitFunc next_init = (ModuleInitFunc) dlsym (RTLD_DEFAULT, "__collector_module_init"); - if (next_init != NULL) -- { -- nmodules++; -- next_init (col_intf); -- } -- TprintfT (DBG_LT1, "collector_module_init: %d modules\n", nmodules); -+ next_init (col_intf); -+ TprintfT (DBG_LT1, "collector_module_init: %d modules\n", next_init ? 1 : 0); - } - - /* Routines concerned with general experiment start and stop */ -@@ -1784,7 +1779,7 @@ __collector_pause () - } - - void --__collector_pause_m (char *reason) -+__collector_pause_m (const char *reason) - { - hrtime_t now; - char xreason[MAXPATHLEN]; -@@ -2451,8 +2446,8 @@ __collector_dlog (int tflag, int level, char *format, ...) - - static void (*__real__exit) (int status) = NULL; /* libc only: _exit */ - static void (*__real__Exit) (int status) = NULL; /* libc only: _Exit */ --void _exit () __attribute__ ((weak, alias ("__collector_exit"))); --void _Exit () __attribute__ ((weak, alias ("__collector_Exit"))); -+void _exit (int status) __attribute__ ((weak, alias ("__collector_exit"))); -+void _Exit (int status) __attribute__ ((weak, alias ("__collector_Exit"))); - - void - __collector_exit (int status) -diff --git a/gprofng/libcollector/collector.h b/gprofng/libcollector/collector.h -index 07a03bdd17a..eda68a0e4f5 100644 ---- a/gprofng/libcollector/collector.h -+++ b/gprofng/libcollector/collector.h -@@ -123,7 +123,7 @@ extern void __collector_terminate_expt (); - extern void __collector_terminate_hook (); - extern void __collector_sample (char *name); - extern void __collector_pause (); --extern void __collector_pause_m (); -+extern void __collector_pause_m (const char *reason); - extern void __collector_resume (); - extern int collector_sigemt_sigaction (const struct sigaction*, - struct sigaction*); -diff --git a/gprofng/libcollector/collectorAPI.c b/gprofng/libcollector/collectorAPI.c -index 5fa6403ad49..449bbbaab65 100644 ---- a/gprofng/libcollector/collectorAPI.c -+++ b/gprofng/libcollector/collectorAPI.c -@@ -26,16 +26,17 @@ - #include "collectorAPI.h" - #include "gp-experiment.h" - --static void *__real_collector_sample = NULL; --static void *__real_collector_pause = NULL; --static void *__real_collector_resume = NULL; --static void *__real_collector_terminate_expt = NULL; --static void *__real_collector_func_load = NULL; --static void *__real_collector_func_unload = NULL; -+static void (*__real_collector_sample)(const char *) = NULL; -+static void (*__real_collector_pause)() = NULL; -+static void (*__real_collector_resume)() = NULL; -+static void (*__real_collector_terminate_expt)() = NULL; -+static void (*__real_collector_func_load)(const char *, const char *, -+ const char *, void *, int, int, Lineno *) = NULL; -+static void (*__real_collector_func_unload)(void *) = NULL; - - #define INIT_API if (init_API == 0) collectorAPI_initAPI() - #define NULL_PTR(x) (__real_##x == NULL) --#define CALL_REAL(x) (*(void(*)())__real_##x) -+#define CALL_REAL(x) (__real_##x) - #define CALL_IF_REAL(x) INIT_API; if (!NULL_PTR(x)) CALL_REAL(x) - - static int init_API = 0; -diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c -index d2a4ad0b60b..867753a22ec 100644 ---- a/gprofng/libcollector/dispatcher.c -+++ b/gprofng/libcollector/dispatcher.c -@@ -909,8 +909,9 @@ sigset (int sig, sighandler_t handler) - - // map interposed symbol versions - static int --gprofng_timer_create (int (real_func) (), clockid_t clockid, -- struct sigevent *sevp, timer_t *timerid) -+gprofng_timer_create (int (real_func) (clockid_t, struct sigevent *, timer_t *), -+ clockid_t clockid, -+ struct sigevent *sevp, timer_t *timerid) - { - // collector reserves SIGPROF - if (sevp == NULL || sevp->sigev_notify != SIGEV_SIGNAL || -@@ -1045,7 +1046,7 @@ __collector_thr_sigsetmask (int how, const sigset_t* iset, sigset_t* oset) - // map interposed symbol versions - - static int --gprofng_pthread_sigmask (int (real_func) (), -+gprofng_pthread_sigmask (int (real_func) (int, const sigset_t *, sigset_t*), - int how, const sigset_t *iset, sigset_t* oset) - { - sigset_t lsigset; -@@ -1140,9 +1141,10 @@ collector_root (void *cargs) - // map interposed symbol versions - - static int --gprofng_pthread_create (int (real_func) (), pthread_t *thread, -- const pthread_attr_t *attr, -- void *(*func)(void*), void *arg) -+gprofng_pthread_create (int (real_func) (pthread_t *, const pthread_attr_t *, -+ void *(*)(void *), void *), -+ pthread_t *thread, const pthread_attr_t *attr, -+ void *(*func)(void*), void *arg) - { - TprintfT (DBG_LTT, "gprofng_pthread_create @%p\n", real_func); - if (dispatch_mode != DISPATCH_ON) -@@ -1277,6 +1279,7 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, - } - - // weak symbols: --int sigprocmask () __attribute__ ((weak, alias ("__collector_sigprocmask"))); --int thr_sigsetmask () __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); -+int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); -+int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); - int setitimer () __attribute__ ((weak, alias ("_setitimer"))); -+ -diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c -index 18060864796..3deb441d9c7 100644 ---- a/gprofng/libcollector/iotrace.c -+++ b/gprofng/libcollector/iotrace.c -@@ -1350,7 +1350,7 @@ mkstemp (char *template) - unsigned pktSize; - if (NULL_PTR (mkstemp)) - init_io_intf (); -- if (CHCK_REENTRANCE (guard) || template == NULL) -+ if (CHCK_REENTRANCE (guard)) - return CALL_REAL (mkstemp)(template); - PUSH_REENTRANCE (guard); - hrtime_t reqt = gethrtime (); -@@ -1405,7 +1405,7 @@ mkstemps (char *template, int slen) - unsigned pktSize; - if (NULL_PTR (mkstemps)) - init_io_intf (); -- if (CHCK_REENTRANCE (guard) || template == NULL) -+ if (CHCK_REENTRANCE (guard)) - return CALL_REAL (mkstemps)(template, slen); - PUSH_REENTRANCE (guard); - hrtime_t reqt = gethrtime (); -@@ -1485,7 +1485,7 @@ close (int fildes) - - /*------------------------------------------------------------- fopen */ - static FILE* --gprofng_fopen (FILE*(real_fopen) (), const char *filename, const char *mode) -+gprofng_fopen (FILE*(real_fopen) (const char *, const char *), const char *filename, const char *mode) - { - int *guard; - FILE *fp = NULL; -@@ -1559,7 +1559,7 @@ DCL_FOPEN (fopen) - - /*------------------------------------------------------------- fclose */ - static int --gprofng_fclose (int(real_fclose) (), FILE *stream) -+gprofng_fclose (int(real_fclose) (FILE *), FILE *stream) - { - int *guard; - int stat; -@@ -1645,7 +1645,7 @@ fflush (FILE *stream) - - /*------------------------------------------------------------- fdopen */ - static FILE* --gprofng_fdopen (FILE*(real_fdopen) (), int fildes, const char *mode) -+gprofng_fdopen (FILE*(real_fdopen) (int, const char *), int fildes, const char *mode) - { - int *guard; - FILE *fp = NULL; -@@ -2957,7 +2957,7 @@ DCL_FGETPOS (fgetpos) - - /*------------------------------------------------------------- fgetpos64 */ - static int --gprofng_fgetpos64 (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos) -+gprofng_fgetpos64 (int(real_fgetpos64) (FILE *, fpos64_t *), FILE *stream, fpos64_t *pos) - { - int *guard; - int ret; -diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c -index 15ba24d2ab5..c2b82894e6b 100644 ---- a/gprofng/libcollector/libcol_util.c -+++ b/gprofng/libcollector/libcol_util.c -@@ -1013,7 +1013,6 @@ __collector_open (const char *path, int oflag, ...) - mode_t mode = 0; - - hrtime_t t_timeout = __collector_gethrtime () + 5 * ((hrtime_t) NANOSEC); -- int nretries = 0; - long long delay = 100; /* start at some small, arbitrary value */ - - /* get optional mode argument if it's expected/required */ -@@ -1058,7 +1057,6 @@ __collector_open (const char *path, int oflag, ...) - delay *= 2; - if (delay > 100000000) - delay = 100000000; /* cap at some large, arbitrary value */ -- nretries++; - } - return fd; - } -diff --git a/gprofng/libcollector/libcol_util.h b/gprofng/libcollector/libcol_util.h -index 2eeeaeed50b..1b1b928180a 100644 ---- a/gprofng/libcollector/libcol_util.h -+++ b/gprofng/libcollector/libcol_util.h -@@ -81,12 +81,6 @@ extern int __collector_mutex_trylock (collector_mutex_t *mp); - #define __collector_mutex_init(xx) \ - do { collector_mutex_t tmp=COLLECTOR_MUTEX_INITIALIZER; *(xx)=tmp; } while(0) - --void __collector_sample (char *name); --void __collector_terminate_expt (); --void __collector_pause (); --void __collector_pause_m (); --void __collector_resume (); -- - struct DT_lineno; - - typedef enum -diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c -index 67b2d7e9030..66844bc1337 100644 ---- a/gprofng/libcollector/linetrace.c -+++ b/gprofng/libcollector/linetrace.c -@@ -1207,7 +1207,7 @@ __collector_vfork (void) - } - - /*------------------------------------------------------------- execve */ --int execve () __attribute__ ((weak, alias ("__collector_execve"))); -+int execve (const char *, char *const [], char *const []) __attribute__ ((weak, alias ("__collector_execve"))); - - int - __collector_execve (const char* path, char *const argv[], char *const envp[]) -@@ -1237,7 +1237,7 @@ __collector_execve (const char* path, char *const argv[], char *const envp[]) - return ret; - } - --int execvp () __attribute__ ((weak, alias ("__collector_execvp"))); -+int execvp (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execvp"))); - - int - __collector_execvp (const char* file, char *const argv[]) -@@ -1269,7 +1269,7 @@ __collector_execvp (const char* file, char *const argv[]) - return ret; - } - --int execv () __attribute__ ((weak, alias ("__collector_execv"))); -+int execv (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execv"))); - - int - __collector_execv (const char* path, char *const argv[]) -@@ -1408,7 +1408,10 @@ __collector_execl (const char* path, const char *arg0, ...) - /*-------------------------------------------------------- posix_spawn */ - // map interposed symbol versions - static int --gprofng_posix_spawn (int(real_posix_spawn) (), -+gprofng_posix_spawn (int(real_posix_spawn) (pid_t *, const char *, -+ const posix_spawn_file_actions_t *, -+ const posix_spawnattr_t *, -+ char *const [], char *const []), - pid_t *pidp, const char *path, - const posix_spawn_file_actions_t *file_actions, - const posix_spawnattr_t *attrp, -@@ -1466,7 +1469,10 @@ DCL_POSIX_SPAWN (posix_spawn) - - /*-------------------------------------------------------- posix_spawnp */ - static int --gprofng_posix_spawnp (int (real_posix_spawnp) (), -+gprofng_posix_spawnp (int (real_posix_spawnp) (pid_t *, const char *, -+ const posix_spawn_file_actions_t *, -+ const posix_spawnattr_t *, -+ char *const [], char *const []), - pid_t *pidp, const char *path, - const posix_spawn_file_actions_t *file_actions, - const posix_spawnattr_t *attrp, -@@ -1754,8 +1760,8 @@ __collector_clone (int (*fn)(void *), void *child_stack, int flags, void *arg, - } - - /*-------------------------------------------------------------------- setuid */ --int setuid () __attribute__ ((weak, alias ("__collector_setuid"))); --int _setuid () __attribute__ ((weak, alias ("__collector_setuid"))); -+int setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); -+int _setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); - - int - __collector_setuid (uid_t ruid) -@@ -1770,8 +1776,8 @@ __collector_setuid (uid_t ruid) - } - - /*------------------------------------------------------------------- seteuid */ --int seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); --int _seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); -+int seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); -+int _seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); - - int - __collector_seteuid (uid_t euid) -@@ -1786,8 +1792,8 @@ __collector_seteuid (uid_t euid) - } - - /*------------------------------------------------------------------ setreuid */ --int setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); --int _setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); -+int setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); -+int _setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); - - int - __collector_setreuid (uid_t ruid, uid_t euid) -@@ -1802,8 +1808,8 @@ __collector_setreuid (uid_t ruid, uid_t euid) - } - - /*-------------------------------------------------------------------- setgid */ --int setgid () __attribute__ ((weak, alias ("__collector_setgid"))); --int _setgid () __attribute__ ((weak, alias ("__collector_setgid"))); -+int setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); -+int _setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); - - int - __collector_setgid (gid_t rgid) -@@ -1818,8 +1824,8 @@ __collector_setgid (gid_t rgid) - } - - /*------------------------------------------------------------------- setegid */ --int setegid () __attribute__ ((weak, alias ("__collector_setegid"))); --int _setegid () __attribute__ ((weak, alias ("__collector_setegid"))); -+int setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); -+int _setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); - - int - __collector_setegid (gid_t egid) -@@ -1834,8 +1840,8 @@ __collector_setegid (gid_t egid) - } - - /*------------------------------------------------------------------ setregid */ --int setregid () __attribute__ ((weak, alias ("__collector_setregid"))); --int _setregid () __attribute__ ((weak, alias ("__collector_setregid"))); -+int setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); -+int _setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); - - int - __collector_setregid (gid_t rgid, gid_t egid) -diff --git a/gprofng/src/BaseMetricTreeNode.h b/gprofng/src/BaseMetricTreeNode.h -index d73d244e27e..7698f9c6eaf 100644 ---- a/gprofng/src/BaseMetricTreeNode.h -+++ b/gprofng/src/BaseMetricTreeNode.h -@@ -85,7 +85,6 @@ private: - - BaseMetricTreeNode *root; // root of tree - BaseMetricTreeNode *parent; // my parent -- bool aggregation; // value is based on children's values - char *name; // bm->get_cmd() for metrics, unique string otherwise - char *uname; // user-visible text - char *unit; // see UNIT_* defines -diff --git a/gprofng/src/Dbe.cc b/gprofng/src/Dbe.cc -index 91a5aa5ef05..bcbf4694565 100644 ---- a/gprofng/src/Dbe.cc -+++ b/gprofng/src/Dbe.cc -@@ -9594,14 +9594,12 @@ dbeGetTLDataRepVals (VMode view_mode, hrtime_t start_ts, hrtime_t delta, - } - if (sampleVals != NULL) - { -- Sample* sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); -- if (!sample || !sample->get_usage ()) -- sample = sample; -- else -+ Sample *sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); -+ if (sample != NULL) - { -- PrUsage* prusage = sample->get_usage (); -- Vector *mstateVals = prusage->getMstateValues (); -- sampleVals->store (eventIdx, mstateVals); -+ PrUsage *prusage = sample->get_usage (); -+ if (prusage != NULL) -+ sampleVals->store (eventIdx, prusage->getMstateValues ()); - } - } - } -diff --git a/gprofng/src/DbeSession.cc b/gprofng/src/DbeSession.cc -index 20329091167..5d6bab75638 100644 ---- a/gprofng/src/DbeSession.cc -+++ b/gprofng/src/DbeSession.cc -@@ -1162,8 +1162,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) - closedir (exp_dir); - exp_names->sort (dir_name_cmp); - Experiment **t_exp_list = new Experiment *[exp_names->size ()]; -- int nsubexps = 0; -- - for (int j = 0, jsz = exp_names->size (); j < jsz; j++) - { - t_exp_list[j] = NULL; -@@ -1220,7 +1218,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) - dexp->open (dpath); - append (dexp); - t_exp_list[j] = dexp; -- nsubexps++; - dexp->set_clock (exp->clock); - - // DbeView add_experiment() is split into two parts -diff --git a/gprofng/src/Disasm.cc b/gprofng/src/Disasm.cc -index 1396e4fb072..d78212cee39 100644 ---- a/gprofng/src/Disasm.cc -+++ b/gprofng/src/Disasm.cc -@@ -49,7 +49,6 @@ struct DisContext - }; - - static const int MAX_DISASM_STR = 2048; --static const int MAX_INSTR_SIZE = 8; - - Disasm::Disasm (char *fname) - { -diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc -index 02a24ebc40d..a31550aff66 100644 ---- a/gprofng/src/Experiment.cc -+++ b/gprofng/src/Experiment.cc -@@ -1935,8 +1935,6 @@ private: - } - - Experiment *exp; -- char *hostname; -- hrtime_t time, tstamp; - }; - - void -diff --git a/gprofng/src/HashMap.h b/gprofng/src/HashMap.h -index 918c0dc95f9..c5fdd345ba8 100644 ---- a/gprofng/src/HashMap.h -+++ b/gprofng/src/HashMap.h -@@ -78,9 +78,8 @@ copy_key (uint64_t a) - } - - template<> inline void --delete_key (uint64_t a) -+delete_key (uint64_t) - { -- a = a; - } - - template<> inline int -diff --git a/gprofng/src/IOActivity.h b/gprofng/src/IOActivity.h -index cf462cf8d55..f3a22ada6b1 100644 ---- a/gprofng/src/IOActivity.h -+++ b/gprofng/src/IOActivity.h -@@ -78,7 +78,6 @@ private: - Hist_data *hist_data_file_all; - Hist_data *hist_data_vfd_all; - Hist_data *hist_data_callstack_all; -- Hist_data *hist_data_callstack; - - DbeView *dbev; - }; -diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc -index ebf888c5a20..b0ed66efcdc 100644 ---- a/gprofng/src/collctrl.cc -+++ b/gprofng/src/collctrl.cc -@@ -952,9 +952,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn) - double dval = strtod (string, &endchar); - if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */ - dval = dval * 1000.; -- else if (*endchar == 'u') /* user specified microseconds */ -- dval = dval; -- else -+ else if (*endchar != 'u') - return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string); - nclkprof_timer = (int) (dval + 0.5); - } -@@ -2901,7 +2899,7 @@ Coll_Ctrl::get (char * control) - } - if (!strncmp (control, ipc_str_javaprof, len)) - { -- if ((java_mode == 0)) -+ if (java_mode == 0) - return strdup (ipc_str_off); - return strdup (ipc_str_on); - } -@@ -2917,7 +2915,7 @@ Coll_Ctrl::get (char * control) - } - if (!strncmp (control, ipc_str_sample_sig, len)) - { -- if ((sample_sig == 0)) -+ if (sample_sig == 0) - return strdup (ipc_str_off); - char *str_signal = find_signal_name (sample_sig); - if (str_signal != NULL) -@@ -2951,15 +2949,15 @@ Coll_Ctrl::get (char * control) - } - if (!strncmp (control, ipc_str_iotrace, len)) - { -- if ((iotrace_enabled == 0)) -+ if (iotrace_enabled == 0) - return strdup (ipc_str_off); - return strdup (ipc_str_on); - } - if (!strncmp (control, ipc_str_count, len)) - { -- if ((count_enabled == 0)) -+ if (count_enabled == 0) - return strdup (ipc_str_off); -- if ((count_enabled < 0)) -+ if (count_enabled < 0) - return strdup ("on\nstatic"); - return strdup (ipc_str_on); - } -diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h -index bb48eadb9f8..ebcdbca561f 100644 ---- a/gprofng/src/collector_module.h -+++ b/gprofng/src/collector_module.h -@@ -40,12 +40,12 @@ struct tm; - * If you add any, please put it in the right place */ - typedef struct CollectorUtilFuncs - { -- int (*access)(); -+ int (*access)(const char *, int); - int (*atoi)(const char *nptr); - void *(*calloc)(size_t nelem, size_t elsize); - int (*clearenv)(void); - int (*close)(int); -- int (*closedir)(); -+ int (*closedir)(DIR *); - int (*execv)(const char *path, char *const argv[]); - void (*exit)(int status); - int (*fclose)(FILE *stream); -@@ -66,20 +66,20 @@ typedef struct CollectorUtilFuncs - off_t (*lseek)(int fd, off_t offset, int whence); - void *(*malloc)(size_t size); - void *(*memset)(void *s1, int c, size_t n); -- int (*mkdir)(); -+ int (*mkdir)(const char *, mode_t); - time_t (*mktime)(struct tm *timeptr); - void *(*mmap)(void *, size_t, int, int, int, off_t); -- void *(*mmap64_)(); -- int (*munmap)(); -+ void *(*mmap64_)(void *, size_t, int, int, int, off_t); -+ int (*munmap)(void *, size_t); - int (*open)(const char *, int, ...); - int (*open_bare)(const char *, int, ...); -- DIR *(*opendir)(); -+ DIR *(*opendir)(const char *); - int (*pclose)(FILE *stream); - FILE *(*popen)(const char *command, const char *mode); - int (*putenv)(char *string); -- ssize_t (*pwrite)(); -- ssize_t (*pwrite64_)(); -- ssize_t (*read)(); -+ ssize_t (*pwrite)(int, const void *, size_t, off_t); -+ ssize_t (*pwrite64_)(int, const void *, size_t, off_t); -+ ssize_t (*read)(int, void *, size_t); - int (*setenv)(const char *name, const char *value, int overwrite); - int (*sigfillset)(sigset_t *set); - int (*sigprocmask)(int how, const sigset_t *set, sigset_t *oldset); -@@ -112,7 +112,7 @@ typedef struct CollectorUtilFuncs - int (*unsetenv)(const char *name); - int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); - pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); -- ssize_t (*write)(); -+ ssize_t (*write)(int, void *, size_t); - double (*atof)(); - void *n_a; - } CollectorUtilFuncs; -diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc -index 200e6080d2e..24af375edf1 100644 ---- a/gprofng/src/gp-display-src.cc -+++ b/gprofng/src/gp-display-src.cc -@@ -75,14 +75,6 @@ private: - bool v_opt; - int multiple; - char *str_compcom; -- bool hex_visible; -- int src_visible; -- int vis_src; -- int vis_dis; -- int threshold_src; -- int threshold_dis; -- int threshold; -- int vis_bits; - }; - - static int -diff --git a/gprofng/src/gp-print.h b/gprofng/src/gp-print.h -index 1b748ea60a3..1a8ad3b6c13 100644 ---- a/gprofng/src/gp-print.h -+++ b/gprofng/src/gp-print.h -@@ -19,7 +19,7 @@ - MA 02110-1301, USA. */ - - #ifndef _GP_PRINT_H --#define _ER_PRINT_H -+#define _GP_PRINT_H - - #include "Command.h" - #include "DbeApplication.h" -diff --git a/gprofng/src/util.cc b/gprofng/src/util.cc -index 201f7088b66..228140b61ae 100644 ---- a/gprofng/src/util.cc -+++ b/gprofng/src/util.cc -@@ -741,17 +741,13 @@ get_relative_link (const char *path_from, const char *path_to) - s2 = canonical_path (s2); - long l = dbe_sstrlen (s1); - // try to find common directories -- int common_slashes = 0; - int last_common_slash = -1; - for (int i = 0; i < l; i++) - { -- if (s1[i] != s2[i]) break; -- if (s1[i] == 0) break; -+ if (s1[i] != s2[i] || s1[i] == 0) -+ break; - if (s1[i] == '/') -- { -- common_slashes++; -- last_common_slash = i; -- } -+ last_common_slash = i; - } - // find slashes in remaining path_to - int slashes = 0; --- -2.50.1 - diff --git a/package/binutils/2.42/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch b/package/binutils/2.42/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch deleted file mode 100644 index 06ca165570..0000000000 --- a/package/binutils/2.42/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch +++ /dev/null @@ -1,619 +0,0 @@ -From 2e59be3bc9dad69af4f62d26107b6ace23e9998a Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 16 Nov 2024 05:13:48 +0000 -Subject: [PATCH] gprofng: fix -std=gnu23 compatibility wrt unprototyped - functions - -C23 removes support for unprototyped functions. Fix function pointer types -accordingly. - -This does not fix all instances, there's a few left as I commented on in -PR32374 (e.g. setitimer which I have a local workaround for but it involves -a glibc implementation detail; the Linaro precommit CI tester pointed that -out too, so dropped that). - -ChangeLog: - PR gprofng/32374 - - * libcollector/collector.c (collector_sample): Fix prototype. - * libcollector/envmgmt.c (putenv): Ditto. - (_putenv): Ditto. - (__collector_putenv): Ditto. - (setenv): Ditto. - (_setenv): Ditto. - (__collector_setenv): Ditto. - (unsetenv): Ditto. - (_unsetenv): Ditto. - (__collector_unsetenv): Ditto. - * libcollector/jprofile.c (open_experiment): Ditto. - (__collector_jprofile_enable_synctrace): Ditto. - (jprof_find_asyncgetcalltrace): Ditto. - * libcollector/libcol_util.c (__collector_util_init): Ditto. - (ARCH): Ditto. - * libcollector/mmaptrace.c (collector_func_load): Ditto. - (collector_func_unload): Ditto. - * libcollector/unwind.c (__collector_ext_unwind_init): Ditto. - * src/collector_module.h: Ditto. - -Upstream: a2f774427e078f3da2c06bdea25f77a61979a695 -Signed-off-by: Thomas Petazzoni ---- - gprofng/libcollector/collector.c | 2 +- - gprofng/libcollector/dispatcher.c | 1 - - gprofng/libcollector/envmgmt.c | 24 ++++----- - gprofng/libcollector/jprofile.c | 10 ++-- - gprofng/libcollector/libcol_util.c | 84 +++++++++++++++--------------- - gprofng/libcollector/mmaptrace.c | 4 +- - gprofng/libcollector/unwind.c | 2 +- - gprofng/src/collector_module.h | 2 +- - 8 files changed, 64 insertions(+), 65 deletions(-) - -diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c -index ef580dcbdd9..899f08a5381 100644 ---- a/gprofng/libcollector/collector.c -+++ b/gprofng/libcollector/collector.c -@@ -1579,7 +1579,7 @@ __collector_resume_experiment () - } - - /* Code to support Samples and Pause/Resume */ --void collector_sample () __attribute__ ((weak, alias ("__collector_sample"))); -+void collector_sample (char *name) __attribute__ ((weak, alias ("__collector_sample"))); - void - __collector_sample (char *name) - { -diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c -index 867753a22ec..5ee0bf895bf 100644 ---- a/gprofng/libcollector/dispatcher.c -+++ b/gprofng/libcollector/dispatcher.c -@@ -1282,4 +1282,3 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, - int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); - int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); - int setitimer () __attribute__ ((weak, alias ("_setitimer"))); -- -diff --git a/gprofng/libcollector/envmgmt.c b/gprofng/libcollector/envmgmt.c -index ebe08f82007..0ff7621070d 100644 ---- a/gprofng/libcollector/envmgmt.c -+++ b/gprofng/libcollector/envmgmt.c -@@ -692,8 +692,8 @@ __collector_env_update (char *envp[]) - - - /*------------------------------------------------------------- putenv */ --int putenv () __attribute__ ((weak, alias ("__collector_putenv"))); --int _putenv () __attribute__ ((weak, alias ("__collector_putenv"))); -+int putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); -+int _putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); - - int - __collector_putenv (char * string) -@@ -701,9 +701,9 @@ __collector_putenv (char * string) - if (CALL_UTIL (putenv) == __collector_putenv || - CALL_UTIL (putenv) == NULL) - { // __collector_libc_funcs_init failed -- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_NEXT, "putenv"); -+ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_NEXT, "putenv"); - if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) -- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_DEFAULT, "putenv"); -+ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_DEFAULT, "putenv"); - if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) - { - TprintfT (DBG_LT2, "__collector_putenv(): ERROR: no pointer found.\n"); -@@ -719,8 +719,8 @@ __collector_putenv (char * string) - } - - /*------------------------------------------------------------- setenv */ --int setenv () __attribute__ ((weak, alias ("__collector_setenv"))); --int _setenv () __attribute__ ((weak, alias ("__collector_setenv"))); -+int setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); -+int _setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); - - int - __collector_setenv (const char *name, const char *value, int overwrite) -@@ -728,9 +728,9 @@ __collector_setenv (const char *name, const char *value, int overwrite) - if (CALL_UTIL (setenv) == __collector_setenv || - CALL_UTIL (setenv) == NULL) - { // __collector_libc_funcs_init failed -- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_NEXT, "setenv"); -+ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_NEXT, "setenv"); - if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) -- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_DEFAULT, "setenv"); -+ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_DEFAULT, "setenv"); - if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) - { - TprintfT (DBG_LT2, "__collector_setenv(): ERROR: no pointer found.\n"); -@@ -765,8 +765,8 @@ __collector_setenv (const char *name, const char *value, int overwrite) - } - - /*------------------------------------------------------------- unsetenv */ --int unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); --int _unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); -+int unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); -+int _unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); - - int - __collector_unsetenv (const char *name) -@@ -774,9 +774,9 @@ __collector_unsetenv (const char *name) - if (CALL_UTIL (unsetenv) == __collector_unsetenv || - CALL_UTIL (unsetenv) == NULL) - { // __collector_libc_funcs_init failed -- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_NEXT, "unsetenv"); -+ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_NEXT, "unsetenv"); - if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) -- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_DEFAULT, "unsetenv"); -+ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_DEFAULT, "unsetenv"); - if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) - { - TprintfT (DBG_LT2, "__collector_unsetenv(): ERROR: no pointer found.\n"); -diff --git a/gprofng/libcollector/jprofile.c b/gprofng/libcollector/jprofile.c -index 1bacacc1a2a..11051f937ef 100644 ---- a/gprofng/libcollector/jprofile.c -+++ b/gprofng/libcollector/jprofile.c -@@ -105,8 +105,8 @@ static void rwrite (int fd, const void *buf, size_t nbyte); - static void addToDynamicArchive (const char* name, const unsigned char* class_data, int class_data_len); - static void (*AsyncGetCallTrace)(JVMPI_CallTrace*, jint, ucontext_t*) = NULL; - static void (*collector_heap_record)(int, int, void*) = NULL; --static void (*collector_jsync_begin)() = NULL; --static void (*collector_jsync_end)(hrtime_t, void *) = NULL; -+static void (*collector_jsync_begin)(void) = NULL; -+static void (*collector_jsync_end)(hrtime_t, void*) = NULL; - - #define gethrtime collector_interface->getHiResTime - -@@ -230,7 +230,7 @@ open_experiment (const char *exp) - else if (__collector_strStartWith (args, "s:") == 0) - { - java_sync_mode = 1; -- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); -+ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); - collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); - } - #endif -@@ -255,7 +255,7 @@ __collector_jprofile_enable_synctrace () - return; - } - java_sync_mode = 1; -- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); -+ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); - collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); - TprintfT (DBG_LT1, "jprofile: turning on Java synctrace, and requesting events\n"); - } -@@ -1129,7 +1129,7 @@ jprof_find_asyncgetcalltrace () - { - void *jvmhandle; - if (__collector_VM_ReadByteInstruction == NULL) -- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); -+ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); - - /* look for stack unwind function using default path */ - AsyncGetCallTrace = (void (*)(JVMPI_CallTrace*, jint, ucontext_t*)) -diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c -index c2b82894e6b..688bdf19c6d 100644 ---- a/gprofng/libcollector/libcol_util.c -+++ b/gprofng/libcollector/libcol_util.c -@@ -1114,7 +1114,7 @@ __collector_util_init () - - ptr = dlsym (libc, "munmap"); - if (ptr) -- __collector_util_funcs.munmap = (int(*)())ptr; -+ __collector_util_funcs.munmap = (int(*)(void *, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT munmap: %s\n", dlerror ()); -@@ -1123,7 +1123,7 @@ __collector_util_init () - - ptr = dlsym (libc, "close"); - if (ptr) -- __collector_util_funcs.close = (int(*)())ptr; -+ __collector_util_funcs.close = (int(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); -@@ -1158,7 +1158,7 @@ __collector_util_init () - - ptr = dlsym (libc, "close"); - if (ptr) -- __collector_util_funcs.close = (int(*)())ptr; -+ __collector_util_funcs.close = (int(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); -@@ -1167,7 +1167,7 @@ __collector_util_init () - - ptr = dlsym (libc, "read"); - if (ptr) -- __collector_util_funcs.read = (ssize_t (*)())ptr; -+ __collector_util_funcs.read = (ssize_t (*)(int, void*, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT read: %s\n", dlerror ()); -@@ -1176,7 +1176,7 @@ __collector_util_init () - - ptr = dlsym (libc, "write"); - if (ptr) -- __collector_util_funcs.write = (ssize_t (*)())ptr; -+ __collector_util_funcs.write = (ssize_t (*)(int, void*, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT write: %s\n", dlerror ()); -@@ -1186,14 +1186,14 @@ __collector_util_init () - #if ARCH(Intel) && WSIZE(32) - ptr = dlvsym (libc, "pwrite", "GLIBC_2.2"); // it is in /lib/libpthread.so.0 - if (ptr) -- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; -+ __collector_util_funcs.pwrite = (ssize_t (*)(int, void*, size_t, off_t))ptr; - else - { - Tprintf (DBG_LT0, "libcol_util: WARNING: dlvsym for %s@%s failed. Using dlsym() instead.", "pwrite", "GLIBC_2.2"); - #endif /* ARCH(Intel) && WSIZE(32) */ - ptr = dlsym (libc, "pwrite"); - if (ptr) -- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; -+ __collector_util_funcs.pwrite = (ssize_t (*)(int, const void*, size_t, off_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pwrite: %s\n", dlerror ()); -@@ -1213,7 +1213,7 @@ __collector_util_init () - #endif /* ARCH(Intel) && WSIZE(32) */ - ptr = dlsym (libc, "pwrite64"); - if (ptr) -- __collector_util_funcs.pwrite64_ = (ssize_t (*)())ptr; -+ __collector_util_funcs.pwrite64_ = (ssize_t (*)(int, const void*, size_t, off_t))ptr; - else - __collector_util_funcs.pwrite64_ = __collector_util_funcs.pwrite; - #if ARCH(Intel) && WSIZE(32) -@@ -1222,7 +1222,7 @@ __collector_util_init () - - ptr = dlsym (libc, "lseek"); - if (ptr) -- __collector_util_funcs.lseek = (off_t (*)())ptr; -+ __collector_util_funcs.lseek = (off_t (*)(int, off_t, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT lseek: %s\n", dlerror ()); -@@ -1231,7 +1231,7 @@ __collector_util_init () - - ptr = dlsym (libc, "access"); - if (ptr) -- __collector_util_funcs.access = (int(*)())ptr; -+ __collector_util_funcs.access = (int(*)(const char*, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT access: %s\n", dlerror ()); -@@ -1240,7 +1240,7 @@ __collector_util_init () - - ptr = dlsym (libc, "mkdir"); - if (ptr) -- __collector_util_funcs.mkdir = (int(*)())ptr; -+ __collector_util_funcs.mkdir = (int(*)(const char*, mode_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mkdir: %s\n", dlerror ()); -@@ -1249,7 +1249,7 @@ __collector_util_init () - - ptr = dlsym (libc, "opendir"); - if (ptr) -- __collector_util_funcs.opendir = (DIR * (*)())ptr; -+ __collector_util_funcs.opendir = (DIR * (*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT opendir: %s\n", dlerror ()); -@@ -1258,7 +1258,7 @@ __collector_util_init () - - ptr = dlsym (libc, "closedir"); - if (ptr) -- __collector_util_funcs.closedir = (int(*)())ptr; -+ __collector_util_funcs.closedir = (int(*)(DIR*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT closedir: %s\n", dlerror ()); -@@ -1267,7 +1267,7 @@ __collector_util_init () - - ptr = dlsym (libc, "execv"); - if (ptr) -- __collector_util_funcs.execv = (int(*)())ptr; -+ __collector_util_funcs.execv = (int(*)(const char*, char* const*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT execv: %s\n", dlerror ()); -@@ -1276,7 +1276,7 @@ __collector_util_init () - - ptr = dlsym (libc, "exit"); - if (ptr) -- __collector_util_funcs.exit = (void(*)())ptr; -+ __collector_util_funcs.exit = (void(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT exit: %s\n", dlerror ()); -@@ -1285,7 +1285,7 @@ __collector_util_init () - - ptr = dlsym (libc, "vfork"); - if (ptr) -- __collector_util_funcs.vfork = (pid_t (*)())ptr; -+ __collector_util_funcs.vfork = (pid_t (*)(void))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vfork: %s\n", dlerror ()); -@@ -1294,7 +1294,7 @@ __collector_util_init () - - ptr = dlsym (libc, "waitpid"); - if (ptr) -- __collector_util_funcs.waitpid = (pid_t (*)())ptr; -+ __collector_util_funcs.waitpid = (pid_t (*)(pid_t, int*, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT waitpid: %s\n", dlerror ()); -@@ -1313,7 +1313,7 @@ __collector_util_init () - - ptr = dlsym (libc, "getcontext"); - if (ptr) -- __collector_util_funcs.getcontext = (int(*)())ptr; -+ __collector_util_funcs.getcontext = (int(*)(ucontext_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getcontext: %s\n", dlerror ()); -@@ -1331,7 +1331,7 @@ __collector_util_init () - - ptr = dlsym (libc, "putenv"); - if (ptr) -- __collector_util_funcs.putenv = (int(*)())ptr; -+ __collector_util_funcs.putenv = (int(*)(char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT putenv: %s\n", dlerror ()); -@@ -1340,7 +1340,7 @@ __collector_util_init () - - ptr = dlsym (libc, "getenv"); - if (ptr) -- __collector_util_funcs.getenv = (char*(*)())ptr; -+ __collector_util_funcs.getenv = (char*(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getenv: %s\n", dlerror ()); -@@ -1349,7 +1349,7 @@ __collector_util_init () - - ptr = dlsym (libc, "time"); - if (ptr) -- __collector_util_funcs.time = (time_t (*)())ptr; -+ __collector_util_funcs.time = (time_t (*)(time_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT time: %s\n", dlerror ()); -@@ -1358,7 +1358,7 @@ __collector_util_init () - - ptr = dlsym (libc, "mktime"); - if (ptr) -- __collector_util_funcs.mktime = (time_t (*)())ptr; -+ __collector_util_funcs.mktime = (time_t (*)(struct tm*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mktime: %s\n", dlerror ()); -@@ -1372,7 +1372,7 @@ __collector_util_init () - - ptr = dlsym (libc, "gmtime_r"); - if (ptr) -- __collector_util_funcs.gmtime_r = (struct tm * (*)())ptr; -+ __collector_util_funcs.gmtime_r = (struct tm * (*)(const time_t*, struct tm*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT gmtime_r: %s\n", dlerror ()); -@@ -1381,7 +1381,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtol"); - if (ptr) -- __collector_util_funcs.strtol = (long (*)())ptr; -+ __collector_util_funcs.strtol = (long (*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtol: %s\n", dlerror ()); -@@ -1390,7 +1390,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtoll"); - if (ptr) -- __collector_util_funcs.strtoll = (long long (*)())ptr; -+ __collector_util_funcs.strtoll = (long long (*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoll: %s\n", dlerror ()); -@@ -1402,7 +1402,7 @@ __collector_util_init () - - ptr = dlsym (libc, "setenv"); - if (ptr) -- __collector_util_funcs.setenv = (int(*)())ptr; -+ __collector_util_funcs.setenv = (int(*)(const char*, const char*, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT setenv: %s\n", dlerror ()); -@@ -1411,7 +1411,7 @@ __collector_util_init () - - ptr = dlsym (libc, "unsetenv"); - if (ptr) -- __collector_util_funcs.unsetenv = (int(*)())ptr; -+ __collector_util_funcs.unsetenv = (int(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT unsetenv: %s\n", dlerror ()); -@@ -1498,7 +1498,7 @@ __collector_util_init () - - ptr = dlsym (libc, "pclose"); - if (ptr) -- __collector_util_funcs.pclose = (int(*)())ptr; -+ __collector_util_funcs.pclose = (int(*)(FILE*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pclose: %s\n", dlerror ()); -@@ -1507,7 +1507,7 @@ __collector_util_init () - - ptr = dlsym (libc, "fgets"); - if (ptr) -- __collector_util_funcs.fgets = (char*(*)())ptr; -+ __collector_util_funcs.fgets = (char*(*)(char*, int, FILE*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT fgets: %s\n", dlerror ()); -@@ -1534,7 +1534,7 @@ __collector_util_init () - - ptr = dlsym (libc, "vsnprintf"); - if (ptr) -- __collector_util_funcs.vsnprintf = (int(*)())ptr; -+ __collector_util_funcs.vsnprintf = (int(*)(char*, size_t, const char*, ...))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vsnprintf: %s\n", dlerror ()); -@@ -1543,7 +1543,7 @@ __collector_util_init () - - ptr = dlsym (libc, "atoi"); - if (ptr) -- __collector_util_funcs.atoi = (int(*)())ptr; -+ __collector_util_funcs.atoi = (int(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT atoi: %s\n", dlerror ()); -@@ -1552,7 +1552,7 @@ __collector_util_init () - - ptr = dlsym (libc, "calloc"); - if (ptr) -- __collector_util_funcs.calloc = (void*(*)())ptr; -+ __collector_util_funcs.calloc = (void*(*)(size_t, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT calloc: %s\n", dlerror ()); -@@ -1562,7 +1562,7 @@ __collector_util_init () - ptr = dlsym (libc, "free"); - if (ptr) - { -- __collector_util_funcs.free = (void(*)())ptr; -+ __collector_util_funcs.free = (void(*)(void*))ptr; - } - else - { -@@ -1572,7 +1572,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strdup"); - if (ptr) -- __collector_util_funcs.libc_strdup = (char*(*)())ptr; -+ __collector_util_funcs.libc_strdup = (char*(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strdup: %s\n", dlerror ()); -@@ -1585,7 +1585,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strerror"); - if (ptr) -- __collector_util_funcs.strerror = (char*(*)())ptr; -+ __collector_util_funcs.strerror = (char*(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror: %s\n", dlerror ()); -@@ -1593,7 +1593,7 @@ __collector_util_init () - } - ptr = dlsym (libc, "strerror_r"); - if (ptr) -- __collector_util_funcs.strerror_r = (int(*)())ptr; -+ __collector_util_funcs.strerror_r = (int(*)(int, char*, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror_r: %s\n", dlerror ()); -@@ -1601,7 +1601,7 @@ __collector_util_init () - } - ptr = dlsym (libc, "strspn"); - if (ptr) -- __collector_util_funcs.strspn = (size_t (*)())ptr; -+ __collector_util_funcs.strspn = (size_t (*)(const char*, const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strspn: %s\n", dlerror ()); -@@ -1610,7 +1610,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtoul"); - if (ptr) -- __collector_util_funcs.strtoul = (unsigned long int(*)())ptr; -+ __collector_util_funcs.strtoul = (unsigned long int(*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoul: %s\n", dlerror ()); -@@ -1619,7 +1619,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtoull"); - if (ptr) -- __collector_util_funcs.strtoull = (unsigned long long int(*)())ptr; -+ __collector_util_funcs.strtoull = (unsigned long long int(*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoull: %s\n", dlerror ()); -@@ -1664,7 +1664,7 @@ __collector_util_init () - - ptr = dlsym (libc, "sysconf"); - if (ptr) -- __collector_util_funcs.sysconf = (long(*)())ptr; -+ __collector_util_funcs.sysconf = (long(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysconf: %s\n", dlerror ()); -@@ -1673,7 +1673,7 @@ __collector_util_init () - - ptr = dlsym (libc, "sigfillset"); - if (ptr) -- __collector_util_funcs.sigfillset = (int(*)())ptr; -+ __collector_util_funcs.sigfillset = (int(*)(sigset_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigfillset: %s\n", dlerror ()); -@@ -1682,7 +1682,7 @@ __collector_util_init () - - ptr = dlsym (libc, "sigprocmask"); - if (ptr) -- __collector_util_funcs.sigprocmask = (int(*)())ptr; -+ __collector_util_funcs.sigprocmask = (int(*)(int, const sigset_t*, sigset_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigprocmask: %s\n", dlerror ()); -diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c -index f07f4d76513..2a6857ab58e 100644 ---- a/gprofng/libcollector/mmaptrace.c -+++ b/gprofng/libcollector/mmaptrace.c -@@ -1209,7 +1209,7 @@ process_vsyscall_page () - /* - * collector API for dynamic functions - */ --void collector_func_load () __attribute__ ((weak, alias ("__collector_func_load"))); -+void collector_func_load (char*, char*, char*, void*, int, int, DT_lineno *) __attribute__ ((weak, alias ("__collector_func_load"))); - void - __collector_func_load (char *name, char *alias, char *sourcename, - void *vaddr, int size, int lntsize, DT_lineno *lntable) -@@ -1218,7 +1218,7 @@ __collector_func_load (char *name, char *alias, char *sourcename, - vaddr, size, lntsize, lntable); - } - --void collector_func_unload () __attribute__ ((weak, alias ("__collector_func_unload"))); -+void collector_func_unload (void *vaddr) __attribute__ ((weak, alias ("__collector_func_unload"))); - void - __collector_func_unload (void *vaddr) - { -diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c -index 91678b1e334..cd47d4fbe0f 100644 ---- a/gprofng/libcollector/unwind.c -+++ b/gprofng/libcollector/unwind.c -@@ -416,7 +416,7 @@ __collector_ext_unwind_init (int record) - omp_no_walk = 1; - - if (__collector_VM_ReadByteInstruction == NULL) -- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); -+ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); - - #if ARCH(SPARC) - #if WSIZE(64) -diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h -index ebcdbca561f..fd888cd58dd 100644 ---- a/gprofng/src/collector_module.h -+++ b/gprofng/src/collector_module.h -@@ -110,7 +110,7 @@ typedef struct CollectorUtilFuncs - long (*sysinfo)(int command, char *buf, long count); - time_t (*time)(time_t *tloc); - int (*unsetenv)(const char *name); -- int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); -+ int (*vsnprintf)(char *str, size_t size, const char *format, ...); - pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); - ssize_t (*write)(int, void *, size_t); - double (*atof)(); --- -2.50.1 - diff --git a/package/binutils/2.42/0007-gprofng-fix-build-with-std-gnu23.patch b/package/binutils/2.42/0007-gprofng-fix-build-with-std-gnu23.patch deleted file mode 100644 index 15a56f14af..0000000000 --- a/package/binutils/2.42/0007-gprofng-fix-build-with-std-gnu23.patch +++ /dev/null @@ -1,199 +0,0 @@ -From e91e1fd342c9ded87f53bc7e9e8d5d693b9a570a Mon Sep 17 00:00:00 2001 -From: Vladimir Mezentsev -Date: Thu, 21 Nov 2024 14:48:20 -0800 -Subject: [PATCH] gprofng: fix build with -std=gnu23 - -Fix function pointer types accordingly. -Remove unused function pointers. - -gprofng/ChangeLog -2024-11-21 Vladimir Mezentsev - - PR gprofng/32374 - PR gprofng/32373 - * common/cpuid.c: Define ATTRIBUTE_UNUSED if necessary. - * libcollector/libcol_util.c (sysinfo): Remove unused pointer. - * src/collector_module.h: Likewise. - * libcollector/dispatcher.c (setitimer): Fix prototype. - * libcollector/linetrace.c (system, grantpt, ptsname): Likewise. - * testsuite/gprofng.display/mttest/mttest.c (dump_arrays): Likewise. - * testsuite/gprofng.display/synprog/endcases.c (xinline_code, - s_inline_code): Likewise. - * testsuite/gprofng.display/synprog/inc_inline.h (ext_inline_code): - Likewise. - * testsuite/gprofng.display/synprog/synprog.c (doabort): Rename nullptr. - -Upstream: 4e943705e3e8a5a9448d087502bcb390a694ad02 -Signed-off-by: Thomas Petazzoni ---- - gprofng/common/cpuid.c | 2 ++ - gprofng/libcollector/dispatcher.c | 2 +- - gprofng/libcollector/libcol_util.c | 9 --------- - gprofng/libcollector/linetrace.c | 10 +++++----- - gprofng/src/collector_module.h | 1 - - gprofng/testsuite/gprofng.display/mttest/mttest.c | 2 +- - gprofng/testsuite/gprofng.display/synprog/endcases.c | 4 ++-- - gprofng/testsuite/gprofng.display/synprog/inc_inline.h | 2 +- - gprofng/testsuite/gprofng.display/synprog/synprog.c | 4 ++-- - 9 files changed, 14 insertions(+), 22 deletions(-) - -diff --git a/gprofng/common/cpuid.c b/gprofng/common/cpuid.c -index af15439eb27..0373969693b 100644 ---- a/gprofng/common/cpuid.c -+++ b/gprofng/common/cpuid.c -@@ -21,7 +21,9 @@ - #if defined(__i386__) || defined(__x86_64) - #include /* GCC-provided */ - #elif defined(__aarch64__) -+#if !defined(ATTRIBUTE_UNUSED) - #define ATTRIBUTE_UNUSED __attribute__((unused)) -+#endif - - static inline uint_t __attribute_const__ - __get_cpuid (unsigned int op ATTRIBUTE_UNUSED, unsigned int *eax, -diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c -index 5ee0bf895bf..e85c343c776 100644 ---- a/gprofng/libcollector/dispatcher.c -+++ b/gprofng/libcollector/dispatcher.c -@@ -1281,4 +1281,4 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, - // weak symbols: - int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); - int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); --int setitimer () __attribute__ ((weak, alias ("_setitimer"))); -+__typeof(setitimer) setitimer __attribute__ ((weak, alias ("_setitimer"))); -diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c -index 688bdf19c6d..46f8b80ccb4 100644 ---- a/gprofng/libcollector/libcol_util.c -+++ b/gprofng/libcollector/libcol_util.c -@@ -1427,15 +1427,6 @@ __collector_util_init () - err = COL_ERROR_UTIL_INIT; - } - -- ptr = dlsym (libc, "sysinfo"); -- if (ptr) -- __collector_util_funcs.sysinfo = (long (*)())ptr; -- else -- { -- CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysinfo: %s\n", dlerror ()); -- err = COL_ERROR_UTIL_INIT; -- } -- - ptr = dlsym (libc, "clearenv"); - if (ptr) - __collector_util_funcs.clearenv = (int(*)())ptr; -diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c -index 66844bc1337..c81ae1a2272 100644 ---- a/gprofng/libcollector/linetrace.c -+++ b/gprofng/libcollector/linetrace.c -@@ -1527,7 +1527,7 @@ DCL_FUNC_VER (DCL_POSIX_SPAWNP, posix_spawnp_2_2, posix_spawnp@GLIBC_2.2) - DCL_POSIX_SPAWNP (posix_spawnp) - - /*------------------------------------------------------------- system */ --int system () __attribute__ ((weak, alias ("__collector_system"))); -+int system (const char *cmd) __attribute__ ((weak, alias ("__collector_system"))); - - int - __collector_system (const char *cmd) -@@ -1582,10 +1582,10 @@ DCL_FUNC_VER (DCL_POPEN, popen_2_0, popen@GLIBC_2.0) - DCL_POPEN (popen) - - /*------------------------------------------------------------- grantpt */ --int grantpt () __attribute__ ((weak, alias ("__collector_grantpt"))); -+int grantpt (int fildes) __attribute__ ((weak, alias ("__collector_grantpt"))); - - int --__collector_grantpt (const int fildes) -+__collector_grantpt (int fildes) - { - if (NULL_PTR (grantpt)) - init_lineage_intf (); -@@ -1607,10 +1607,10 @@ __collector_grantpt (const int fildes) - } - - /*------------------------------------------------------------- ptsname */ --char *ptsname () __attribute__ ((weak, alias ("__collector_ptsname"))); -+char *ptsname (int fildes) __attribute__ ((weak, alias ("__collector_ptsname"))); - - char * --__collector_ptsname (const int fildes) -+__collector_ptsname (int fildes) - { - if (NULL_PTR (ptsname)) - init_lineage_intf (); -diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h -index fd888cd58dd..6640f12fa3c 100644 ---- a/gprofng/src/collector_module.h -+++ b/gprofng/src/collector_module.h -@@ -107,7 +107,6 @@ typedef struct CollectorUtilFuncs - int (*symlink)(const char *s1, const char *s2); - int (*syscall)(int number, ...); - long (*sysconf)(int name); -- long (*sysinfo)(int command, char *buf, long count); - time_t (*time)(time_t *tloc); - int (*unsetenv)(const char *name); - int (*vsnprintf)(char *str, size_t size, const char *format, ...); -diff --git a/gprofng/testsuite/gprofng.display/mttest/mttest.c b/gprofng/testsuite/gprofng.display/mttest/mttest.c -index e0835c833e5..3db5b8d8e86 100644 ---- a/gprofng/testsuite/gprofng.display/mttest/mttest.c -+++ b/gprofng/testsuite/gprofng.display/mttest/mttest.c -@@ -171,7 +171,7 @@ void computeJ (workStruct_t *x); - void computeK (workStruct_t *x); - void addone (workCtr_t *x); - void init_arrays (int strat); --void dump_arrays (); -+void dump_arrays (hrtime_t real, hrtime_t cpu, int case_index); - void *do_work (void *v); - void thread_work (); - void nothreads (Workblk *array, struct scripttab *k); -diff --git a/gprofng/testsuite/gprofng.display/synprog/endcases.c b/gprofng/testsuite/gprofng.display/synprog/endcases.c -index a6a1389658a..6f1c83b6859 100644 ---- a/gprofng/testsuite/gprofng.display/synprog/endcases.c -+++ b/gprofng/testsuite/gprofng.display/synprog/endcases.c -@@ -40,8 +40,8 @@ static void s_inline_code (int); - void ext_inline_code (int); - - #ifndef NO_INLINE --void xinline_code () __attribute__ ((always_inline)); --void s_inline_code () __attribute__ ((always_inline)); -+void xinline_code (int) __attribute__ ((always_inline)); -+void s_inline_code (int) __attribute__ ((always_inline)); - #endif - - #include "inc_inline.h" -diff --git a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h -index da42563c828..6600eacb66d 100644 ---- a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h -+++ b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h -@@ -19,7 +19,7 @@ - MA 02110-1301, USA. */ - - #ifndef NO_INLINE --void ext_inline_code() __attribute__ ((always_inline)); -+void ext_inline_code(int) __attribute__ ((always_inline)); - #endif - - void -diff --git a/gprofng/testsuite/gprofng.display/synprog/synprog.c b/gprofng/testsuite/gprofng.display/synprog/synprog.c -index cf1bc5b0909..05920dc7419 100644 ---- a/gprofng/testsuite/gprofng.display/synprog/synprog.c -+++ b/gprofng/testsuite/gprofng.display/synprog/synprog.c -@@ -528,14 +528,14 @@ reapchildren () - int - doabort (int k) - { -- char *nullptr = NULL; -+ char *p = NULL; - char c; - - /* Log the event */ - wlog ("start of doabort", NULL); - - /* and dereference a NULL */ -- c = *nullptr; -+ c = *p; - - /* this should never be reached */ - return (int) c; --- -2.50.1 - diff --git a/package/binutils/2.42/0001-sh-conf.patch b/package/binutils/2.45.1/0001-sh-conf.patch similarity index 84% rename from package/binutils/2.42/0001-sh-conf.patch rename to package/binutils/2.45.1/0001-sh-conf.patch index c381017850..66104ca580 100644 --- a/package/binutils/2.42/0001-sh-conf.patch +++ b/package/binutils/2.45.1/0001-sh-conf.patch @@ -1,4 +1,4 @@ -From d71fb5a9999ee7c8963342caa0d5cbb16872ab07 Mon Sep 17 00:00:00 2001 +From 0bf75276c392cac7794e78e1572abcd793d99e4e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:38:13 +0100 Subject: [PATCH] sh-conf @@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 670684d83d1..967c6708a0c 100755 +index bbfb5979546..bcd95684ae1 100755 --- a/configure +++ b/configure -@@ -4042,7 +4042,7 @@ case "${target}" in +@@ -4056,7 +4056,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -33,10 +33,10 @@ index 670684d83d1..967c6708a0c 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index 88b4800e298..2c8d08ff6ec 100644 +index f9694cdf901..d6a3623ba50 100644 --- a/configure.ac +++ b/configure.ac -@@ -1269,7 +1269,7 @@ case "${target}" in +@@ -1278,7 +1278,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -46,5 +46,5 @@ index 88b4800e298..2c8d08ff6ec 100644 sh*-*-elf) ;; -- -2.43.0 +2.51.1 diff --git a/package/binutils/2.42/0002-poison-system-directories.patch b/package/binutils/2.45.1/0002-poison-system-directories.patch similarity index 87% rename from package/binutils/2.42/0002-poison-system-directories.patch rename to package/binutils/2.45.1/0002-poison-system-directories.patch index 5c790999d4..fc60b5874f 100644 --- a/package/binutils/2.42/0002-poison-system-directories.patch +++ b/package/binutils/2.45.1/0002-poison-system-directories.patch @@ -1,4 +1,4 @@ -From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001 +From 92f4bd0e1713577e30491e99a0226088eaeae740 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:45:38 +0100 Subject: [PATCH] poison-system-directories @@ -6,6 +6,8 @@ Subject: [PATCH] poison-system-directories Patch adapted to binutils 2.23.2 and extended to use BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. +[Waldemar: rebase on top of 2.43] +Signed-off-by: Waldemar Brodkorb [Waldemar: rebase on top of 2.39] Signed-off-by: Waldemar Brodkorb [Romain: rebase on top of 2.33.1] @@ -74,17 +76,17 @@ Signed-off-by: Scott Garman ld/configure.ac | 10 ++++++++++ ld/ld.h | 8 ++++++++ ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ + ld/ldfile.c | 16 ++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) + 9 files changed, 88 insertions(+) diff --git a/ld/config.in b/ld/config.in -index 52d62f06ff0..b5944e7ba55 100644 +index 790efd336be..2b237bcda5e 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -70,6 +70,9 @@ +@@ -86,6 +86,9 @@ language is requested. */ #undef ENABLE_NLS @@ -95,27 +97,27 @@ index 52d62f06ff0..b5944e7ba55 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index ba1e5e2a215..2220d7afe2a 100755 +index cd410bd64d1..7e9913949d4 100755 --- a/ld/configure +++ b/ld/configure -@@ -844,6 +844,7 @@ with_lib_path +@@ -841,6 +841,7 @@ enable_checking + with_lib_path enable_targets - enable_64_bit_bfd with_sysroot +enable_poison_system_directories enable_gold enable_got enable_compressed_debug_sections -@@ -1534,6 +1535,8 @@ Optional Features: +@@ -1535,6 +1536,8 @@ Optional Features: + --disable-largefile omit support for large files --enable-checking enable run-time checks --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) + --enable-poison-system-directories + warn for use of native system library directories --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15587,7 +15590,18 @@ else +@@ -15393,7 +15396,18 @@ else fi @@ -135,10 +137,10 @@ index ba1e5e2a215..2220d7afe2a 100755 # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : diff --git a/ld/configure.ac b/ld/configure.ac -index 4a11787ae71..104a531fb0f 100644 +index f528ae42ef7..dcf1e17fae6 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) +@@ -115,6 +115,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -156,7 +158,7 @@ index 4a11787ae71..104a531fb0f 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index 54d9079678c..9f0163b2911 100644 +index c8688153bd4..0b16caf347a 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -166,6 +166,14 @@ typedef struct @@ -175,10 +177,10 @@ index 54d9079678c..9f0163b2911 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 4fda259a552..11fd8f7547b 100644 +index cf750d15259..1acaa26f107 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -3108,6 +3108,18 @@ string identifying the original linked file does not change. +@@ -3362,6 +3362,18 @@ bit string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -198,10 +200,10 @@ index 4fda259a552..11fd8f7547b 100644 @item --package-metadata=@var{JSON} Request the creation of a @code{.note.package} ELF note section. The diff --git a/ld/ldfile.c b/ld/ldfile.c -index dc9875d8813..49d899ee49d 100644 +index 75fd360d5e3..3526ea8146c 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) +@@ -328,6 +328,22 @@ ldfile_add_library_path (const char *name, bool cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -221,15 +223,14 @@ index dc9875d8813..49d899ee49d 100644 + "cross-compilation\n"), name); + } +#endif -+ } - /* Try to open a BFD for a lang_input_statement. */ + static void diff --git a/ld/ldlex.h b/ld/ldlex.h -index 161a9d4d8dc..4ca50b9c299 100644 +index c8d61478c60..4b175dca108 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -168,6 +168,8 @@ enum option_values +@@ -172,6 +172,8 @@ enum option_values OPTION_CTF_VARIABLES, OPTION_NO_CTF_VARIABLES, OPTION_CTF_SHARE_TYPES, @@ -239,10 +240,10 @@ index 161a9d4d8dc..4ca50b9c299 100644 OPTION_NO_ERROR_EXECSTACK, OPTION_WARN_EXECSTACK_OBJECTS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index e90c2021b33..43fe888eba8 100644 +index 67c60c3f80d..c2365e4006c 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -325,6 +325,8 @@ main (int argc, char **argv) +@@ -671,6 +671,8 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -252,10 +253,10 @@ index e90c2021b33..43fe888eba8 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the diff --git a/ld/lexsup.c b/ld/lexsup.c -index 099dff8ecde..01626712c77 100644 +index bde20465835..422866f4ea9 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -642,6 +642,14 @@ static const struct ld_option ld_options[] = +@@ -652,6 +652,14 @@ static const struct ld_option ld_options[] = " is: share-unconflicted (default),\n" " share-duplicated"), TWO_DASHES }, @@ -270,7 +271,7 @@ index 099dff8ecde..01626712c77 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -654,6 +662,7 @@ parse_args (unsigned argc, char **argv) +@@ -664,6 +672,7 @@ parse_args (unsigned argc, char **argv) int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -278,7 +279,7 @@ index 099dff8ecde..01626712c77 100644 struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1769,6 +1778,14 @@ parse_args (unsigned argc, char **argv) +@@ -1800,6 +1809,14 @@ parse_args (unsigned argc, char **argv) } break; @@ -293,7 +294,7 @@ index 099dff8ecde..01626712c77 100644 case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1922,6 +1939,10 @@ parse_args (unsigned argc, char **argv) +@@ -1944,6 +1961,10 @@ parse_args (unsigned argc, char **argv) command_line.soname = NULL; } @@ -305,5 +306,5 @@ index 099dff8ecde..01626712c77 100644 { einfo (_("%P: missing --end-group; added as last command line option\n")); -- -2.43.0 +2.51.1 diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 33002e0028..a043771339 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_43_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_44_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. @@ -16,23 +16,23 @@ config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.43)" depends on BR2_arc -config BR2_BINUTILS_VERSION_2_42_X - bool "binutils 2.42" - config BR2_BINUTILS_VERSION_2_43_X bool "binutils 2.43.1" config BR2_BINUTILS_VERSION_2_44_X bool "binutils 2.44" +config BR2_BINUTILS_VERSION_2_45_X + bool "binutils 2.45.1" + endchoice config BR2_BINUTILS_VERSION string default "arc-2024.12-release" if BR2_BINUTILS_VERSION_ARC - default "2.42" if BR2_BINUTILS_VERSION_2_42_X default "2.43.1" if BR2_BINUTILS_VERSION_2_43_X default "2.44" if BR2_BINUTILS_VERSION_2_44_X + default "2.45.1" if BR2_BINUTILS_VERSION_2_45_X config BR2_BINUTILS_GPROFNG bool "gprofng support" diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index b40463262c..183b7c1f4e 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,7 +1,7 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz sha512 20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824 binutils-2.43.1.tar.xz sha512 b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7 binutils-2.44.tar.xz +sha512 ea030419eba387579ab717be7e3223fc99e93b586860b06003c12489f93441640d4082736f76aa5e98233db4f46e232f536a45e471486de1f5b64e1b827c167e binutils-2.45.1.tar.xz # Locally calculated (fetched from Github) sha512 46c336a16bde7b73dc4ceac0986887d47d542a1452e1936ef871b5e76afdb6cad4b18ccb4d93341358e7bb92c2ef74781e1fb72935d527d15251ac9f9daa8305 binutils-gdb-arc-2024.12-release.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index c79f3414af..0f2384d69d 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2024.12-release else -BINUTILS_VERSION = 2.43.1 +BINUTILS_VERSION = 2.44 endif endif # BINUTILS_VERSION diff --git a/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch b/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch deleted file mode 100644 index 817fee195e..0000000000 --- a/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e7e341b7ba6fa9fb875718e8740b03c2041278e8 Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Mon, 2 Jun 2025 12:09:13 +0100 -Subject: [PATCH] bisonflex: Fix build on machines with modern flex - -With bootgen 2025.1, the directory structure was re-done. In the process of -doing this, the source files in the bisonflex directory lost the fix below -which had been applied on an earlier version of bootgen: - -Bootgen embeds an old version of flex, but uses the system include syntax -(#include <>) to reference it, causing conflicts on systems with the -development headers for a modern flex version installed, leading to build -issues like: - -../bisonflex/bif.yy.cpp: In member function 'virtual int BIF::FlexScanner::yylex()': -../bisonflex/bif.yy.cpp:1608:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'}) - -Fix it by using normal local #include statements by: - -sed -i 's//"../win_include/FlexLexer.h"/g' * - -Upstream: submitted to AMD internal jira process - -Signed-off-by: Neal Frager ---- - bisonflex/bif.yy.cpp | 2 +- - bisonflex/cmdoptions.yy.cpp | 2 +- - bisonflex/reginit.yy.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bisonflex/bif.yy.cpp b/bisonflex/bif.yy.cpp -index 8d4d364..35f0aa5 100755 ---- a/bisonflex/bif.yy.cpp -+++ b/bisonflex/bif.yy.cpp -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; - - #define yytext_ptr yytext - --#include -+#include "../win_include/FlexLexer.h" - - int yyFlexLexer::yywrap() { return 1; } - int yyFlexLexer::yylex() -diff --git a/bisonflex/cmdoptions.yy.cpp b/bisonflex/cmdoptions.yy.cpp -index 661d7f3..a76ac81 100755 ---- a/bisonflex/cmdoptions.yy.cpp -+++ b/bisonflex/cmdoptions.yy.cpp -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; - - #define yytext_ptr yytext - --#include -+#include "../win_include/FlexLexer.h" - - int yyFlexLexer::yywrap() { return 1; } - int yyFlexLexer::yylex() -diff --git a/bisonflex/reginit.yy.cpp b/bisonflex/reginit.yy.cpp -index d830734..dede473 100755 ---- a/bisonflex/reginit.yy.cpp -+++ b/bisonflex/reginit.yy.cpp -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; - - #define yytext_ptr yytext - --#include -+#include "../win_include/FlexLexer.h" - - int yyFlexLexer::yywrap() { return 1; } - int yyFlexLexer::yylex() --- -2.25.1 - diff --git a/package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch b/package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch new file mode 100644 index 0000000000..738887e26b --- /dev/null +++ b/package/bootgen/0001-lms-hash-sigs-hss_param.c-add-stdio.h-include.patch @@ -0,0 +1,51 @@ +From 1675ec9d76b32400f612b1c542be6dbf77dea986 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Tue, 25 Nov 2025 12:54:48 +0000 +Subject: [PATCH] lms-hash-sigs/hss_param.c: add stdio.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The lms-hash-sigs/hss_param.c is missing an include of stdio.h. Without it, +the following build error can occur: + +hss_param.c: In function ‘hss_get_parameter_set’: +hss_param.c:157:13: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration] + 157 | printf("Private key expired\n"); + | ^~~~~~ +hss_param.c:7:1: note: include ‘’ or provide a declaration of ‘printf’ + 6 | #include "lm_common.h" + +++ |+#include + 7 | +hss_param.c:157:13: warning: incompatible implicit declaration of built-in function ‘printf’ [-Wbuiltin-declaration-mismatch] + 157 | printf("Private key expired\n"); + | ^~~~~~ +hss_param.c:157:13: note: include ‘’ or provide a declaration of ‘printf’ +make[3]: *** [Makefile:38: hss_param.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +make[2]: *** [Makefile:84: build/bin/bootgen] Error 2 + +The above error was reported on Debian 13 / gcc 14.2.0. + +Reported-by: Peter Korsgaard +Signed-off-by: Neal Frager +Upstream: submitted to Xilinx bootgen repo with CR-1256741 +--- + lms-hash-sigs/hss_param.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lms-hash-sigs/hss_param.c b/lms-hash-sigs/hss_param.c +index 7a2abd6..6b2b950 100755 +--- a/lms-hash-sigs/hss_param.c ++++ b/lms-hash-sigs/hss_param.c +@@ -4,6 +4,7 @@ + #include "endian.h" + #include "hss_zeroize.h" + #include "lm_common.h" ++#include + + static struct map_structure { + param_set_t public; +-- +2.25.1 + diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash index 7670a5d1ee..995074c591 100644 --- a/package/bootgen/bootgen.hash +++ b/package/bootgen/bootgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3de43a331e10b2a8079d4681ad72cef4884bc3a09250d3d80811d677f3ffe560 bootgen-xilinx_v2025.1.tar.gz +sha256 c92d9be48fabc943c4addd9b12beced6671f5547b4f6dc01e7ccf0f274dbef66 bootgen-xilinx_v2025.2.tar.gz sha256 36e278ff2cc9ef95154a923bf4a9450414f358779045ae4f863c8d77fb18dbdb LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk index 939872b29c..e5cfee18d9 100644 --- a/package/bootgen/bootgen.mk +++ b/package/bootgen/bootgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTGEN_VERSION = xilinx_v2025.1 +BOOTGEN_VERSION = xilinx_v2025.2 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf BOOTGEN_LICENSE = Apache-2.0 diff --git a/package/bullet/0001-update-CMake-required-version.patch b/package/bullet/0001-update-CMake-required-version.patch new file mode 100644 index 0000000000..f2805c90cf --- /dev/null +++ b/package/bullet/0001-update-CMake-required-version.patch @@ -0,0 +1,22 @@ +From d1a4256b3a019117f2bb6cb8c63d6367aaf512e2 Mon Sep 17 00:00:00 2001 +From: Erwin Coumans +Date: Wed, 23 Apr 2025 14:17:20 -0700 +Subject: [PATCH] update CMake required version + +Upstream: https://github.com/bulletphysics/bullet3/commit/d1a4256b3a019117f2bb6cb8c63d6367aaf512e2 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a695b71726..e7a58e6d67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.4.3) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + cmake_policy(SET CMP0017 NEW) + #this line has to appear before 'PROJECT' in order to be able to disable incremental linking diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 88377109db..cd8a95f7a2 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 42e6c4b260cffd92dfa755e26390f45f5842e8c1a5f64f2b2e68adfbe82d1542 ccache-4.12.1.tar.xz +sha256 96ad53c76ecdb9c7a78e28a9bfdf2c95d7eece28546510fde7e16e5a13e2f7f8 ccache-4.12.2.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt sha256 fc33d985529cdb5ea484ee46d6df4de6a6bca25ebdd3f3211c9d15f1c59dc75a LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 75ef404d27..4f6a6bdece 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.12.1 +CCACHE_VERSION = 4.12.2 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index b30ce03a1c..86f93b0ac8 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -63,10 +63,25 @@ config BR2_HOST_CMAKE_AT_LEAST_3_31 bool select BR2_HOST_CMAKE_AT_LEAST_3_30 +config BR2_HOST_CMAKE_AT_LEAST_4_0 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_31 + +config BR2_HOST_CMAKE_AT_LEAST_4_1 + bool + select BR2_HOST_CMAKE_AT_LEAST_4_0 + +config BR2_HOST_CMAKE_AT_LEAST_4_2 + bool + select BR2_HOST_CMAKE_AT_LEAST_4_1 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "4.2" if BR2_HOST_CMAKE_AT_LEAST_4_2 + default "4.1" if BR2_HOST_CMAKE_AT_LEAST_4_1 + default "4.0" if BR2_HOST_CMAKE_AT_LEAST_4_0 default "3.31" if BR2_HOST_CMAKE_AT_LEAST_3_31 default "3.30" if BR2_HOST_CMAKE_AT_LEAST_3_30 default "3.29" if BR2_HOST_CMAKE_AT_LEAST_3_29 diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index cbca2fc355..2bc7b740d2 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.31/cmake-3.31.9-SHA-256.txt -sha256 5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83 cmake-3.31.9.tar.gz +# From https://cmake.org/files/v4.2/cmake-4.2.0-SHA-256.txt +sha256 4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579 cmake-4.2.0.tar.gz # Locally calculated -sha256 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8 Copyright.txt +sha256 1e0d48f16c60f400838a96989684ae12cec35cb96688db11e8cb0204058cf4b8 LICENSE.rst diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 8f3a54be5a..66b169440c 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,11 +5,11 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 3.31 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 4.2 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause -CMAKE_LICENSE_FILES = Copyright.txt +CMAKE_LICENSE_FILES = LICENSE.rst CMAKE_CPE_ID_VALID = YES # Tool download MITM attack warning if using npm package to install cmake CMAKE_IGNORE_CVES = CVE-2016-10642 diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 6568aa1d7b..127bcace6d 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -476,6 +476,7 @@ config BR2_PACKAGE_COLLECTD_PING config BR2_PACKAGE_COLLECTD_POSTGRESQL bool "postgresql" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -489,6 +490,7 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL collectd 'value lists'. comment "postgresql support needs a toolchain w/ wchar" + depends on !BR2_sparc depends on !BR2_USE_WCHAR comment "postgresql support can't be built with Optimize for fast" diff --git a/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch b/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch deleted file mode 100644 index 45b1fcd146..0000000000 --- a/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c347aeb43775109cbc2824b99cb10b1b3440c191 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 17 May 2021 21:27:11 +0200 -Subject: [PATCH] server/CMakeLists.txt: don't override CMAKE_EXE_LINKER_FLAGS - -Don't override CMAKE_EXE_LINKER_FLAGS as this could break the build if -CMAKE_EXE_LINKER_FLAGS is already set by the user (for example to pass --latomic) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cutelyst/cutelyst/pull/312] ---- - wsgi/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt -index ec5689f7..1ed56859 100644 ---- a/wsgi/CMakeLists.txt -+++ b/wsgi/CMakeLists.txt -@@ -95,7 +95,7 @@ install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server - cxx_generalized_initializers - ) - if (JEMALLOC_FOUND) -- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " -Wl,--no-as-needed") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed") - target_link_libraries(cutelyst-wsgi2 PRIVATE ${JEMALLOC_LIBRARIES}) - endif() - --- -2.30.2 - diff --git a/package/cutelyst/cutelyst.hash b/package/cutelyst/cutelyst.hash index d35fdcc890..5103f58138 100644 --- a/package/cutelyst/cutelyst.hash +++ b/package/cutelyst/cutelyst.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b0e3d658a60d68906f7255b78bad64af1aa07cb3b785fbf61629b7355f089baa cutelyst-2.11.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 351578d495213c438365f988a70bb8f8c14b1d7dcef79ce0f723dd584388aa77 cutelyst-3.5.0.tar.gz +sha256 ca0c629be86a1691ec413a3f9137a1aa62663d5ec30c5867cf4b283f18eb0bd7 COPYING diff --git a/package/cutelyst/cutelyst.mk b/package/cutelyst/cutelyst.mk index 5313b003ad..9b9e3d4d8a 100644 --- a/package/cutelyst/cutelyst.mk +++ b/package/cutelyst/cutelyst.mk @@ -4,11 +4,11 @@ # ################################################################################ -CUTELYST_VERSION = 2.11.0 +CUTELYST_VERSION = 3.5.0 CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION) CUTELYST_INSTALL_STAGING = YES CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO -CUTELYST_LICENSE = LGPL-2.1+ +CUTELYST_LICENSE = BSD-3-Clause CUTELYST_LICENSE_FILES = COPYING CUTELYST_DEPENDENCIES = qt5base diff --git a/package/docopt-cpp/0002-Increase-cmake_minimum_required-to-3.5.patch b/package/docopt-cpp/0002-Increase-cmake_minimum_required-to-3.5.patch new file mode 100644 index 0000000000..2bc7d33593 --- /dev/null +++ b/package/docopt-cpp/0002-Increase-cmake_minimum_required-to-3.5.patch @@ -0,0 +1,40 @@ +From 05d507da0d153faff381f44968833ebffdc03447 Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Wed, 1 Nov 2023 13:39:42 +0200 +Subject: [PATCH] Increase cmake_minimum_required to 3.5 + +CMake version 3.27 deprecates compatibility with versions older than +3.5. Increase the minimum required so that the project can be built +without warnings. + +Upstream: https://github.com/docopt/docopt.cpp/commit/05d507da0d153faff381f44968833ebffdc03447 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + README.rst | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28da614..246e90e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + project(docopt.cpp VERSION 0.6.2) + + include(GNUInstallDirs) +diff --git a/README.rst b/README.rst +index 5fe8b4f..6d7012d 100644 +--- a/README.rst ++++ b/README.rst +@@ -87,7 +87,7 @@ Alternatively manual installation is done using (unix):: + To link *docopt.cpp*, the simplest is to use CMake. The general structure of your + ``CMakeLists.txt`` would be as follows:: + +- cmake_minimum_required(VERSION 3.1) ++ cmake_minimum_required(VERSION 3.5) + + project(example) + diff --git a/package/double-conversion/0001-CMake-Raised-required-version-to-3.5.patch b/package/double-conversion/0001-CMake-Raised-required-version-to-3.5.patch new file mode 100644 index 0000000000..9d8482d5d2 --- /dev/null +++ b/package/double-conversion/0001-CMake-Raised-required-version-to-3.5.patch @@ -0,0 +1,27 @@ +From 101e1ba89dc41ceb75090831da97c43a76cd2906 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 20 Feb 2025 15:20:07 +0100 +Subject: [PATCH] CMake: Raised required version to 3.5 (#240) + +CMake >= 4.0.0-rc1 removed compatibility with versions < 3.5 and errors +out with such versions passed to cmake_minimum_required(). 3.5.0 has +been released 9 years ago, so I'd assume it's available almost +everywhere. + +Upstream: https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8749ef86..31457723 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(double-conversion VERSION 3.3.0) + + option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) diff --git a/package/doxygen/doxygen.hash b/package/doxygen/doxygen.hash index ff2fac7b9c..ec46705d29 100644 --- a/package/doxygen/doxygen.hash +++ b/package/doxygen/doxygen.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656 doxygen-1.8.18.src.tar.gz +sha256 a8cafe605867ad475aaf288a3852783076e1df83aabf16488bbfa958062e7440 doxygen-1.15.0.src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/doxygen/doxygen.mk b/package/doxygen/doxygen.mk index b3bcb34097..c31271197d 100644 --- a/package/doxygen/doxygen.mk +++ b/package/doxygen/doxygen.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOXYGEN_VERSION = 1.8.18 +DOXYGEN_VERSION = 1.15.0 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz DOXYGEN_SITE = https://sourceforge.net/projects/doxygen/files/rel-$(DOXYGEN_VERSION) DOXYGEN_LICENSE = GPL-2.0 diff --git a/package/firmware-utils/firmware-utils.hash b/package/firmware-utils/firmware-utils.hash index 8e09c06733..e258516aec 100644 --- a/package/firmware-utils/firmware-utils.hash +++ b/package/firmware-utils/firmware-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d6fdc6ba3cb3976df68625cbc59a1e0acbd5ecaf9daa41c3a2aaad1ff368f51 firmware-utils-86739f2b3ae9502368b89ef37fa6f31c42aad6f4-git4.tar.gz +sha256 8a12240dfdca5e26a4b2443724276a0a25f61797e133757605ed1b9941145fc3 firmware-utils-c42a3bc53da869d02c8ae4d62b3b08a95ff5833f-git4.tar.gz diff --git a/package/firmware-utils/firmware-utils.mk b/package/firmware-utils/firmware-utils.mk index d5b079e4f5..77be4a9224 100644 --- a/package/firmware-utils/firmware-utils.mk +++ b/package/firmware-utils/firmware-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_UTILS_VERSION = 86739f2b3ae9502368b89ef37fa6f31c42aad6f4 +FIRMWARE_UTILS_VERSION = c42a3bc53da869d02c8ae4d62b3b08a95ff5833f FIRMWARE_UTILS_SITE = https://git.openwrt.org/project/firmware-utils.git FIRMWARE_UTILS_SITE_METHOD = git FIRMWARE_UTILS_LICENSE = \ diff --git a/package/flann/0001-Set-policy_max-to-3.10-in-cmake_minimum_required-.patch b/package/flann/0001-Set-policy_max-to-3.10-in-cmake_minimum_required-.patch new file mode 100644 index 0000000000..d11b35a805 --- /dev/null +++ b/package/flann/0001-Set-policy_max-to-3.10-in-cmake_minimum_required-.patch @@ -0,0 +1,24 @@ +From a6803c235c0107f3690010c2fc429e3875c4b7c6 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Thu, 22 May 2025 19:26:16 +0200 +Subject: [PATCH] Set policy_max to 3.10 in cmake_minimum_required to support + CMake 4.0 + +Upstream: https://github.com/flann-lib/flann/pull/526 + +Signed-off-by: Bernd Kuhls +[backported to 1.9.2] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f79d173a..85d5a560 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.12...3.10) + + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) diff --git a/package/flare-engine/0001-Minimum-CMake-version-3.5.patch b/package/flare-engine/0001-Minimum-CMake-version-3.5.patch new file mode 100644 index 0000000000..ca7c1d500c --- /dev/null +++ b/package/flare-engine/0001-Minimum-CMake-version-3.5.patch @@ -0,0 +1,26 @@ +From 9500379f886484382bba2f893faf49865de9f2c0 Mon Sep 17 00:00:00 2001 +From: Justin Jacobs +Date: Sat, 5 Apr 2025 18:27:55 -0400 +Subject: [PATCH] Minimum CMake version = 3.5 + +From the CMake 4.0 release notes: +> Compatibility with versions of CMake older than 3.5 has been removed. + +Upstream: https://github.com/flareteam/flare-engine/commit/9500379f886484382bba2f893faf49865de9f2c0 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 897c19c3d..def8121c4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + Project (Flare) +-cmake_minimum_required (VERSION 2.8.12) ++cmake_minimum_required (VERSION 3.5) + + Set (PACKAGE "FLARE") + Set (VERSION "1.14") diff --git a/package/flare-game/0001-Minimum-CMake-version-3.5.patch b/package/flare-game/0001-Minimum-CMake-version-3.5.patch new file mode 100644 index 0000000000..934dcddc74 --- /dev/null +++ b/package/flare-game/0001-Minimum-CMake-version-3.5.patch @@ -0,0 +1,26 @@ +From 5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a Mon Sep 17 00:00:00 2001 +From: Justin Jacobs +Date: Sat, 5 Apr 2025 18:31:03 -0400 +Subject: [PATCH] Minimum CMake version = 3.5 + +From the CMake 4.0 release notes: +> Compatibility with versions of CMake older than 3.5 has been removed. + +Upstream: https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d98c2ae5f..9c1750552 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + Project (Flare-Game LANGUAGES NONE) +-cmake_minimum_required (VERSION 2.8.12) ++cmake_minimum_required (VERSION 3.5) + + Set (PACKAGE "FLARE-GAME") + Set (VERSION "1.14") diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index a096f00373..aad3d1ab11 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 690ecca4d36b678f028afe780fb6750cece540e621a1c3f50bd98f54fe97d15c fmc-lf-6.12.20-2.0.0.tar.gz +sha256 e3a9e2742bd68c5eb04f3d803b0b61926a163621058e3cc6a34f241683b5b153 fmc-lf-6.12.34-2.1.0.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 LICENSE diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index bea7c5299a..d88fa9614d 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMC_VERSION = lf-6.12.20-2.0.0 +FMC_VERSION = lf-6.12.34-2.1.0 FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = LICENSE diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index 7293ecbc07..4f2b3d4d46 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 491315e35fb8d411305f4e66413ee3fe0e265f9cc8b5f27ec7587d15bf79991f fmlib-lf-6.12.20-2.0.0.tar.gz +sha256 4e39b3a756d4b53ab58b9282ed55505e69c7a79d8e79d5c9eb953d931ce7cdf8 fmlib-lf-6.12.34-2.1.0.tar.gz sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca LICENSE diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 14bcca5e40..e5f4f3c820 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMLIB_VERSION = lf-6.12.20-2.0.0 +FMLIB_VERSION = lf-6.12.34-2.1.0 FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) FMLIB_LICENSE = BSD-3-Clause FMLIB_LICENSE_FILES = LICENSE diff --git a/package/frr/0001-lib-make-getloadavg-optional-in-late-timer-warnings.patch b/package/frr/0001-lib-make-getloadavg-optional-in-late-timer-warnings.patch deleted file mode 100644 index d03f64882e..0000000000 --- a/package/frr/0001-lib-make-getloadavg-optional-in-late-timer-warnings.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d76100a2b9a2ec814ad0a1fb844a395a6dc2f6bd Mon Sep 17 00:00:00 2001 -From: Maxime Leroy -Date: Mon, 11 Aug 2025 13:44:02 +0200 -Subject: [PATCH] lib: make getloadavg() optional in late timer warnings - -Commit ff76fb21d7b3 ("lib: improve late timer warnings") added an -unconditional getloadavg() call. Older libcs (e.g. uClibc, dietlibc) -lack this function, breaking the build. Before, no system load was -shown, so skipping it restores prior behavior. - -Fixes: ff76fb21d7b3 ("lib: improve late timer warnings") -Signed-off-by: Maxime Leroy -Upstream: https://github.com/FRRouting/frr/pull/19366 ---- - configure.ac | 1 + - lib/event.c | 4 ++++ - 2 files changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 87eba6784a..b8ef7bb777 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1369,6 +1369,7 @@ dnl --------------- - AC_CHECK_FUNCS([ \ - strlcat strlcpy \ - getgrouplist \ -+ getloadavg \ - openat \ - unlinkat \ - posix_fallocate \ -diff --git a/lib/event.c b/lib/event.c -index 1eb41d07ce..22876574fb 100644 ---- a/lib/event.c -+++ b/lib/event.c -@@ -1924,7 +1924,11 @@ static void event_tardy_warn(struct event *thread, unsigned long since_us) - double loadavg[3]; - int rv; - -+#ifdef HAVE_GETLOADAVG - rv = getloadavg(loadavg, array_size(loadavg)); -+#else -+ rv = -1; -+#endif - if (rv < 0) - bprintfrr(&fb, "not available"); - else { --- -2.43.0 - diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 12030a0df8..3ba034606d 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8e4003eaba168626c5ea7a6735f2c85c87b04214e6f8c8f2715b21f8ae40970b frr-10.4.1.tar.gz +sha256 a84b973e713349dca09e2009f33dc499564f2e9faba01c0d3cba9204802b0cd5 frr-10.5.0.tar.gz sha256 7bf053957d6c38e39a06a112c60ff35b228d3bd03edbe8c9a03508b051128d16 COPYING sha256 f9e0c21faf738da586281c0beaad3cd56204c19085a10fe05e4d3d7f8b5863d2 doc/licenses/BSD-2-Clause sha256 aca297b8fd3a43e3bb200f1e2e043c0db6c897325f5ff7f23f7530302a6bf713 doc/licenses/BSD-3-Clause diff --git a/package/frr/frr.mk b/package/frr/frr.mk index e41ee33caa..af94793bd1 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 10.4.1 +FRR_VERSION = 10.5.0 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0+ FRR_LICENSE_FILES = \ @@ -23,6 +23,7 @@ FRR_LICENSE_FILES = \ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES +FRR_INSTALL_STAGING = YES FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) \ diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch deleted file mode 100644 index a1d4e1b46f..0000000000 --- a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka -Date: Wed, 12 Jan 2022 00:24:20 +0100 -Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir - -This argument has been removed in Meson 0.61.0: - - gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" - -https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: - -> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. - -Fixes #89 - -[aperez@igalia.com: backport from upstream] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998@free.fr: make it an actual backport] -Signed-off-by: Yann E. MORIN ---- - gck/meson.build | 1 - - gcr/meson.build | 1 - - ui/meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/gck/meson.build b/gck/meson.build -index 756b486..a21a1e9 100644 ---- a/gck/meson.build -+++ b/gck/meson.build -@@ -131,7 +131,6 @@ if get_option('introspection') - sources: gck_gir_sources, - namespace: 'Gck', - nsversion: '@0@'.format(gck_major_version), -- packages: gck_deps, - export_packages: 'gck-@0@'.format(gck_major_version), - includes: [ 'GObject-2.0', 'Gio-2.0' ], - header: 'gck/gck.h', -diff --git a/gcr/meson.build b/gcr/meson.build -index 2233a44..c83641b 100644 ---- a/gcr/meson.build -+++ b/gcr/meson.build -@@ -190,7 +190,6 @@ if get_option('introspection') - sources: [ gcr_base_public_sources, gcr_base_headers ], - namespace: 'Gcr', - nsversion: '@0@'.format(gcr_major_version), -- packages: gcr_base_deps, - export_packages: 'gcr-base-@0@'.format(gcr_major_version), - includes: [ - 'GObject-2.0', -diff --git a/ui/meson.build b/ui/meson.build -index e656ea2..32ee057 100644 ---- a/ui/meson.build -+++ b/ui/meson.build -@@ -152,7 +152,6 @@ if get_option('introspection') - export_packages: 'gcr-ui-@0@'.format(gcr_major_version), - identifier_prefix: 'Gcr', - symbol_prefix: 'gcr', -- packages: gcr_ui_deps, - includes: [ - 'GObject-2.0', - 'Gio-2.0', --- -2.25.1 - diff --git a/package/gcr/Config.in b/package/gcr/Config.in index dbc22cf478..751accb723 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GCR select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_P11_KIT help Library for cryptographic UIs and accessing PKCS#11 modules. diff --git a/package/gcr/gcr.hash b/package/gcr/gcr.hash index f6cc44e97d..1a67849f86 100644 --- a/package/gcr/gcr.hash +++ b/package/gcr/gcr.hash @@ -1,3 +1,4 @@ -# From https://download.gnome.org/sources/gcr/3.40/gcr-3.40.0.sha256sum -sha256 b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 gcr-3.40.0.tar.xz +# From https://download.gnome.org/sources/gcr/4.4/gcr-4.4.0.1.sha256sum +sha256 0c3c341e49f9f4f2532a4884509804190a0c2663e6120360bb298c5d174a8098 gcr-4.4.0.1.tar.xz +# Locally computed sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk index 3a8c01729f..a3be8ecdf2 100644 --- a/package/gcr/gcr.mk +++ b/package/gcr/gcr.mk @@ -4,14 +4,15 @@ # ################################################################################ -GCR_VERSION_MAJOR = 3.40 -GCR_VERSION = $(GCR_VERSION_MAJOR).0 +GCR_VERSION_MAJOR = 4.4 +GCR_VERSION = $(GCR_VERSION_MAJOR).0.1 GCR_SITE = https://download.gnome.org/sources/gcr/$(GCR_VERSION_MAJOR) GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz GCR_DEPENDENCIES = \ host-pkgconf \ libgcrypt \ libglib2 \ + libsecret \ p11-kit \ $(TARGET_NLS_DEPENDENCIES) GCR_INSTALL_STAGING = YES @@ -29,19 +30,19 @@ endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala -GCR_CONF_OPTS += -Dintrospection=true +GCR_CONF_OPTS += -Dintrospection=true -Dvapi=true else -GCR_CONF_OPTS += -Dintrospection=false +GCR_CONF_OPTS += -Dintrospection=false -Dvapi=false endif -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += -Dgtk=true -else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) -GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += -Dgtk=true +ifeq ($(BR2_PACKAGE_LIBGTK4_X11),y) +GCR_DEPENDENCIES += libgtk4 +GCR_CONF_OPTS += -Dgtk4=true +else ifeq ($(BR2_PACKAGE_LIBGTK4_WAYLAND),y) +GCR_DEPENDENCIES += libgtk4 +GCR_CONF_OPTS += -Dgtk4=true else -GCR_CONF_OPTS += -Dgtk=false +GCR_CONF_OPTS += -Dgtk4=false endif $(eval $(meson-package)) diff --git a/package/gflags/0001-build-support-cmake-4.0.patch b/package/gflags/0001-build-support-cmake-4.0.patch new file mode 100644 index 0000000000..de01384d05 --- /dev/null +++ b/package/gflags/0001-build-support-cmake-4.0.patch @@ -0,0 +1,53 @@ +From 70c01a642f08734b7bddc9687884844ca117e080 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 31 Mar 2025 18:35:49 -0400 +Subject: [PATCH] build: support cmake 4.0 (#367) + +Signed-off-by: Rui Chen + +Upstream: https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + test/config/CMakeLists.txt | 2 +- + test/nc/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4b5db235..a664bb12 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,7 +70,7 @@ + ## - GFLAGS_INSTALL_SHARED_LIBS + ## - GFLAGS_INSTALL_STATIC_LIBS + +-cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + + if (POLICY CMP0042) + cmake_policy (SET CMP0042 NEW) +diff --git a/test/config/CMakeLists.txt b/test/config/CMakeLists.txt +index 6190b253..205121e8 100644 +--- a/test/config/CMakeLists.txt ++++ b/test/config/CMakeLists.txt +@@ -1,6 +1,6 @@ + ## gflags package configuration tests + +-cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + + project (gflags_${TEST_NAME}) + +diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt +index d00b07d0..1b4d511a 100644 +--- a/test/nc/CMakeLists.txt ++++ b/test/nc/CMakeLists.txt +@@ -1,6 +1,6 @@ + ## gflags negative compilation tests + +-cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + + if (NOT TEST_NAME) + message (FATAL_ERROR "Missing TEST_NAME CMake flag") diff --git a/package/git/git.hash b/package/git/git.hash index 19b212cd0d..3dcd1d4437 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62 git-2.51.0.tar.xz +sha256 3cd8fee86f69a949cb610fee8cd9264e6873d07fa58411f6060b3d62729ed7c5 git-2.52.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index a01e7c9d53..bd1c1eeb61 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.51.0 +GIT_VERSION = 2.52.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ diff --git a/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch b/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch deleted file mode 100644 index ac150622d5..0000000000 --- a/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3edb88b55c0870989778c670d555aa159a2c3abc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 31 Aug 2020 20:56:43 +0200 -Subject: [PATCH] don't install a libtool file with static library - -Static library is supported since version 1.3.11 and -https://github.com/silnrsi/graphite/commit/2f143c04da5caa43ddf4dba437b2f2bc26bf4238 - -However, graphite2 is still installing libgraphite2.la which contains -incorrect information (i.e. dlname set to libgraphite2.so and -old_library set to ''): - -dlname='libgraphite2.so' - -library_names='libgraphite2.so.3.2.1 libgraphite2.so.3 libgraphite2.so' - -old_library='' - -dependency_libs='' - -This will result in the following build failure with any applications -using this file such as harfbuzz: - -arm-linux-g++.br_real: error: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgraphite2.so: No such file or directory -make[5]: *** [main] Error 1 - -Instead of trying to fix this libtool file, just disable it when -building a static library as it is not needed - -Fixes: - - http://autobuild.buildroot.org/results/9ebe1d11e80755d59190ef2aae82bbba5cc45e44 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/silnrsi/graphite/pull/65] ---- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b6ac26bf..a7ace040 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -131,7 +131,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - nolib_test(stdc++ $) - endif () - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") -- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ if (BUILD_SHARED_LIBS) -+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ endif() - endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -@@ -146,7 +148,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - include(Graphite) - nolib_test(stdc++ $) - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") -- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ if (BUILD_SHARED_LIBS) -+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ endif() - endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") --- -2.28.0 - diff --git a/package/graphite2/graphite2.hash b/package/graphite2/graphite2.hash index e005375f8a..b788112b5d 100644 --- a/package/graphite2/graphite2.hash +++ b/package/graphite2/graphite2.hash @@ -1,4 +1,3 @@ -# From https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.sha256sum -sha256 f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d graphite2-1.3.14.tgz # Locally computed -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE +sha256 b5e919f4b5788f8ed5a2d9d0ce17a23d1c0f625979e53c5e7336fc2ba0b7a7d6 graphite2-1.3.14-121-g142e1bda3439d2bd376bcac9c2b247c9532bacde.tar.gz +sha256 cab46cd45adbfea4b1d0f14b033c70062c73074fa0b56532c2f351576ddf455e LICENSE diff --git a/package/graphite2/graphite2.mk b/package/graphite2/graphite2.mk index 7f9e3c516e..9686492c20 100644 --- a/package/graphite2/graphite2.mk +++ b/package/graphite2/graphite2.mk @@ -4,10 +4,8 @@ # ################################################################################ -GRAPHITE2_VERSION = 1.3.14 -GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz -GRAPHITE2_SITE = \ - https://github.com/silnrsi/graphite/releases/download/$(GRAPHITE2_VERSION) +GRAPHITE2_VERSION = 1.3.14-121-g142e1bda3439d2bd376bcac9c2b247c9532bacde +GRAPHITE2_SITE = $(call github,silnrsi,graphite,$(GRAPHITE2_VERSION)) GRAPHITE2_INSTALL_STAGING = YES GRAPHITE2_LICENSE = LGPL-2.1+ GRAPHITE2_LICENSE_FILES = LICENSE diff --git a/package/gtksourceview/Config.in b/package/gtksourceview/Config.in index e87969b15d..8f1f35c018 100644 --- a/package/gtksourceview/Config.in +++ b/package/gtksourceview/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_GTKSOURCEVIEW bool "gtksourceview" - depends on BR2_PACKAGE_LIBGTK3 + depends on BR2_PACKAGE_LIBGTK4 select BR2_PACKAGE_LIBXML2 help GtkSourceView is a portable C library that extends the diff --git a/package/gtksourceview/gtksourceview.hash b/package/gtksourceview/gtksourceview.hash index 7a9cf00655..9d74d2810b 100644 --- a/package/gtksourceview/gtksourceview.hash +++ b/package/gtksourceview/gtksourceview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: -sha256 a5c20d3a6347533689358f3ea52486409f6dd41d5a69c65eab7570cfaffee8e6 gtksourceview-3.24.7.tar.xz +# Hash from: https://download.gnome.org/sources/gtksourceview/5.18/gtksourceview-5.18.0.sha256sum +sha256 051a78fe38f793328047e5bcd6d855c6425c0b480c20d9432179e356742c6ac0 gtksourceview-5.18.0.tar.xz # Locally computed: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/gtksourceview/gtksourceview.mk b/package/gtksourceview/gtksourceview.mk index 3f5aaea4ae..052904cca0 100644 --- a/package/gtksourceview/gtksourceview.mk +++ b/package/gtksourceview/gtksourceview.mk @@ -4,14 +4,15 @@ # ################################################################################ -GTKSOURCEVIEW_VERSION_MAJOR = 3.24 -GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).7 +GTKSOURCEVIEW_VERSION_MAJOR = 5.18 +GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).0 GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz GTKSOURCEVIEW_SITE = \ https://download.gnome.org/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) GTKSOURCEVIEW_LICENSE = LGPL-2.1+ GTKSOURCEVIEW_LICENSE_FILES = COPYING GTKSOURCEVIEW_INSTALL_STAGING = YES -GTKSOURCEVIEW_DEPENDENCIES = host-pkgconf libglib2 libxml2 libgtk3 +GTKSOURCEVIEW_DEPENDENCIES = host-pkgconf libglib2 libxml2 libgtk4 +GTKSOURCEVIEW_CONF_OPTS = -Dbuild-testsuite=false -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch b/package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch new file mode 100644 index 0000000000..ef76f01f66 --- /dev/null +++ b/package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch @@ -0,0 +1,27 @@ +From cb4ddac12977fd1abd88a1feacbab090d9ad5ecb Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 3 Dec 2025 20:06:22 +0100 +Subject: [PATCH] Remove -Werror=deprecated-declarations + +Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/issues/29 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index c92a833..64a0513 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,7 +44,6 @@ conf.set('HAVE_GTK_SOURCEVIEW', gtksourceview.found()) + conf.set('GETTEXT_PACKAGE', '"@0@"'.format(meson.project_name())) + conf.set('LOCALEDIR', '"@0@"'.format(localedir)) + cc = meson.get_compiler('c') +-add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c') + conf.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_@0@'.format(glib_version.underscorify())) + conf.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_@0@'.format(glib_version.underscorify())) + +-- +2.47.3 + diff --git a/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch b/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch deleted file mode 100644 index c81d1b01fe..0000000000 --- a/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Thu, 3 Aug 2023 23:44:15 +0200 -Subject: [PATCH] common: Drop deprecated xmlRecoverMemory - -Fixes #27 - -Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 -Signed-off-by: Fabrice Fontaine ---- - src/common/pretty-print.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c -index c692664..c8ebc9a 100644 ---- a/src/common/pretty-print.c -+++ b/src/common/pretty-print.c -@@ -34,7 +34,11 @@ pretty_print_xml (const char *xml) - char *text; - int length; - -- doc = xmlRecoverMemory (xml, strlen (xml)); -+ doc = xmlReadMemory (xml, -+ strlen (xml), -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - - if (!doc) - return NULL; --- -GitLab - diff --git a/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch b/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch deleted file mode 100644 index c76d440b5d..0000000000 --- a/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4e06104df81fba2cda06d4747b33e75f4cade458 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Fri, 24 Nov 2023 18:12:50 +0100 -Subject: [PATCH] common: Fix compatibility with libxml2 2.12 - -Fixes #28 - -Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/4e06104df81fba2cda06d4747b33e75f4cade458 -Signed-off-by: Fabrice Fontaine ---- - src/common/pretty-print.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c -index c8ebc9a..1519cb0 100644 ---- a/src/common/pretty-print.c -+++ b/src/common/pretty-print.c -@@ -22,6 +22,7 @@ - - #include "pretty-print.h" - -+#include - #include - - #include --- -GitLab - diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 28e2661360..6dc8bd74f2 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp-tools/0.12/gupnp-tools-0.12.1.sha256sum: -sha256 53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba gupnp-tools-0.12.1.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp-tools/0.12/gupnp-tools-0.12.2.sha256sum +sha256 4c92f2d1a3d454ec1f5fb05ef08ca34df9c743af64c8b5965c35884d46cb005c gupnp-tools-0.12.2.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 99fdf54f13..910a157816 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.12 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).1 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ https://download.gnome.org/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 0426009dd3..f2424d44d2 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz +sha256 5aed35668876b661662c56575af982af8d5c7cb8e30b6ba220eacc7e00f0894f hackrf-v2024.02.1-118-g390837715b3741902b1b13c899bfd04a0bb6b0da.tar.gz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 0d7533815d..c1be8ea9e6 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,9 +4,8 @@ # ################################################################################ -HACKRF_VERSION = 2023.01.1 -HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) -HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz +HACKRF_VERSION = v2024.02.1-118-g390837715b3741902b1b13c899bfd04a0bb6b0da +HACKRF_SITE = $(call github,greatscottgadgets,hackrf,$(HACKRF_VERSION)) HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index b96c36648e..6a0b931aea 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e9ff93b9807cc014ed8f7f5cb5dc2c31e714058c82ddc59b7355f5c57c9b759e hwdata-0.401.tar.gz +sha256 e390fe2f5f5ef7ed9ccbe62eb7cd40d4ee2b57389e7869c0dc96433c81812e7a hwdata-0.402.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index f826faf94e..8a8e399c21 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.401 +HWDATA_VERSION = 0.402 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/package/icu/icu.hash b/package/icu/icu.hash index bf9451db8e..4f60681c54 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061 icu4c-77_1-src.tgz -sha256 451167c55c0fa447cc2d5632714f5e3c567fe4f1e1badefab2c1333852198aca LICENSE +sha256 6217f58ca39b23127605cfc6c7e0d3475fe4b0d63157011383d716cb41617886 icu4c-78.1-sources.tgz +sha256 e55522d81edc687a341a4411e0776e54ca654e90147f354a90458aaced4116af LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 4789edf0e2..a0b4388355 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,8 +7,8 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 77-1 -ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz +ICU_VERSION = 78.1 +ICU_SOURCE = icu4c-$(ICU_VERSION)-sources.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) ICU_LICENSE = ICU License diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index daa9aca8d0..9f1172464b 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 3fa09d623c2a9488bc6c40072b080ef719a4e78d89e30cc0ddbaabacd4875e37 igh-ethercat-1.6.3.tar.gz +sha256 e9b97d4a8c3a1224fe9119ada448f4024bacea2ca940a811073170e42d828b76 igh-ethercat-1.6.8.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 1d93d473da..03f004d2b4 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = 1.6.3 +IGH_ETHERCAT_VERSION = 1.6.8 IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION)) IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER diff --git a/package/iperf3/0001-Fix-a-compilation-issue-with-uClibc-due-to-a-missing.patch b/package/iperf3/0001-Fix-a-compilation-issue-with-uClibc-due-to-a-missing.patch deleted file mode 100644 index cc2f4bd595..0000000000 --- a/package/iperf3/0001-Fix-a-compilation-issue-with-uClibc-due-to-a-missing.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e5c4263c6b2c5b84a6edeb1cf3c95bddd73d4d7c Mon Sep 17 00:00:00 2001 -From: Kadambini Nema -Date: Sat, 17 May 2025 16:20:07 -0700 -Subject: [PATCH] Fix a compilation issue with uClibc due to a missing include - file. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ------- -In file included from t_auth.c:35: -iperf_api.h:395:77: error: unknown type name ‘va_list’ - 395 | void iperf_exit(struct iperf_test *test, int exit_code, const char *format, va_list argp) __attribute__ ((noreturn)); - | ^~~~~~~ -iperf_api.h:33:1: note: ‘va_list’ is defined in header ‘’; did you forget to ‘#include ’? - 32 | #include - +++ |+#include - 33 | #include ------ - -Signed-off-by: Kadambini Nema -Upstream: https://github.com/esnet/iperf/pull/1888 ---- - src/iperf_api.c | 1 - - src/iperf_api.h | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/iperf_api.c b/src/iperf_api.c -index aeec91dd3..d4a06bec9 100644 ---- a/src/iperf_api.c -+++ b/src/iperf_api.c -@@ -53,7 +53,6 @@ - #include - #include - #include --#include - #include - - #if defined(HAVE_CPUSET_SETAFFINITY) -diff --git a/src/iperf_api.h b/src/iperf_api.h -index 03d273e8c..cd82e6f9b 100644 ---- a/src/iperf_api.h -+++ b/src/iperf_api.h -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef __cplusplus diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 3d9ff0cf5d..ee60d717e6 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.19.1.tar.gz.sha256 -sha256 dc63f89ec581ea99f8b558d8eb35109de06383010db5a1906c208a562ba0c270 iperf-3.19.1.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.20.tar.gz.sha256 +sha256 3acc572d1ecca4e0b20359c7bf0132ddc80d982efeee20c86f6726a9a6094388 iperf-3.20.tar.gz # Locally computed sha256 7c9ba0385fcf35c4c9e08ad0c0cba72d4315f36f0f742fef4de826a28cc33a97 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index df6b32abc1..bb8eece6b2 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.19.1 +IPERF3_VERSION = 3.20 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT diff --git a/package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch b/package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch new file mode 100644 index 0000000000..fcebffe3da --- /dev/null +++ b/package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch @@ -0,0 +1,46 @@ +From f3011b5fae183a463630b4168626dfefe9b4c74e Mon Sep 17 00:00:00 2001 +From: Naushir Patuck +Date: Thu, 16 Oct 2025 14:45:33 +0100 +Subject: [PATCH] core: Switch libcamera string controls to use + std::string_view + +This is a change to the libcamera API, switch to std::string_view from +std::string. + +Signed-off-by: Naushir Patuck + +Upstream: https://github.com/raspberrypi/rpicam-apps/commit/f3011b5fae183a463630b4168626dfefe9b4c74e + +Signed-off-by: Bernd Kuhls +--- + core/options.cpp | 2 +- + core/rpicam_app.cpp | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/core/options.cpp b/core/options.cpp +index cf704c2a..d3296548 100644 +--- a/core/options.cpp ++++ b/core/options.cpp +@@ -418,7 +418,7 @@ bool OptsInternal::Parse(boost::program_options::variables_map &vm, RPiCamApp *a + std::vector> cameras = app->GetCameras(); + if (camera < cameras.size()) + { +- const std::string cam_id = *cameras[camera]->properties().get(libcamera::properties::Model); ++ const std::string_view cam_id = *cameras[camera]->properties().get(libcamera::properties::Model); + + if (cam_id.find("imx708") != std::string::npos) + { +diff --git a/core/rpicam_app.cpp b/core/rpicam_app.cpp +index 9e5a2d0c..0f0b5ffa 100644 +--- a/core/rpicam_app.cpp ++++ b/core/rpicam_app.cpp +@@ -128,8 +128,7 @@ std::string const &RPiCamApp::CameraId() const + + std::string RPiCamApp::CameraModel() const + { +- auto model = camera_->properties().get(properties::Model); +- return model ? *model : camera_->id(); ++ return std::string(camera_->properties().get(properties::Model).value_or(camera_->id())); + } + + void RPiCamApp::OpenCamera() diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 92361bbade..15812a0e2f 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_LIBCAMERA depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_WCHAR # gnutls + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 # clone3() select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBYAML select BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO if !BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE @@ -110,7 +111,8 @@ comment "lc-compliance test application needs a toolchain w/ C++, wchar, threads endif # BR2_PACKAGE_LIBCAMERA -comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" +comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, headers >= 5.3" depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index bbec9c517d..4e79be844e 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 ee2c7086b3c08133bba44856fb9b2ffd1132532150d14da7daecd99ab8a566c2 libcamera-v0.5.1-git4.tar.gz +sha256 85d85409d6e04bcf2e1ed57d9b59ebcc9fb770e5d39690d7ac233e9784835b89 libcamera-v0.6.0-git4.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index a2ff3284d7..e86e05328c 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.5.1 +LIBCAMERA_VERSION = v0.6.0 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ diff --git a/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch b/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch deleted file mode 100644 index 77e29ad833..0000000000 --- a/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8fc28b4c4c01581b25220fdbc1eeda196e399256 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Oct 2018 09:28:00 +0200 -Subject: [PATCH] CMakeLists.txt: conditionally use -Wpedantic - --Wpedantic is only provided by gcc >= 4.8. Since showing pedantic -warnings is not really mandatory, let's only use this option when the -compiler supports it. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/quiet/libcorrect/pull/25 ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 193f311..e570198 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,13 +3,18 @@ project(Correct C) - include(CheckLibraryExists) - include(CheckIncludeFiles) - include(CheckCSourceCompiles) -+include(CheckCCompilerFlag) - - if(MSVC) - set(LIBM "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") - else(MSVC) - set(LIBM "m") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -Wpedantic -Wall") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -Wall") -+check_c_compiler_flag(-Wpedantic COMPILER_SUPPORTS_WPEDANTIC) -+if(COMPILER_SUPPORTS_WPEDANTIC) -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpedantic") -+endif() - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -fsanitize=address") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie,") --- -2.14.4 - diff --git a/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch b/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch index 82e4f13e66..dc0c18e063 100644 --- a/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch +++ b/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch @@ -8,6 +8,8 @@ Check that compiler supports -fsanitize=address before using it Fixes: - http://autobuild.buildroot.net/results/221d6a418e75b39fe645c3a56cee676518d2cff6 +Upstream: https://github.com/quiet/libcorrect/pull/26 + Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 6 +++++- diff --git a/package/libcorrect/libcorrect.hash b/package/libcorrect/libcorrect.hash index 4c6289fb82..0385abeb8c 100644 --- a/package/libcorrect/libcorrect.hash +++ b/package/libcorrect/libcorrect.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 79861750540fb3a1cc501ee217cb4d1febc4855f3fb82e5eb60906eec5379890 libcorrect-ce6c17f1f988765ae3695315d7cce1f2a2e6cf0d.tar.gz +sha256 5a4305aabe6c7d5b58f6677c41c54ad5e8d9003f7a5998f7344d93534e4c5760 libcorrect-f5a28c74fba7a99736fe49d3a5243eca29517ae9.tar.gz sha256 135138cd4304aa637836758dc5edfb5f21b7d09ecc637d25288d206b151a5768 LICENSE diff --git a/package/libcorrect/libcorrect.mk b/package/libcorrect/libcorrect.mk index 0a84aa5c26..9f2beb1d4a 100644 --- a/package/libcorrect/libcorrect.mk +++ b/package/libcorrect/libcorrect.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCORRECT_VERSION = ce6c17f1f988765ae3695315d7cce1f2a2e6cf0d +LIBCORRECT_VERSION = f5a28c74fba7a99736fe49d3a5243eca29517ae9 LIBCORRECT_SITE = $(call github,quiet,libcorrect,$(LIBCORRECT_VERSION)) LIBCORRECT_LICENSE = BSD-3-Clause LIBCORRECT_LICENSE_FILES = LICENSE diff --git a/package/libcue/0001-Raise-CMake-minimum-version-to-3.10.patch b/package/libcue/0001-Raise-CMake-minimum-version-to-3.10.patch new file mode 100644 index 0000000000..f61b752004 --- /dev/null +++ b/package/libcue/0001-Raise-CMake-minimum-version-to-3.10.patch @@ -0,0 +1,42 @@ +From d62e39506f4f9b12d58efbd2f1e2667c06b13a19 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 28 Sep 2025 22:12:39 +0200 +Subject: [PATCH] Raise CMake minimum version to 3.10 + +Signed-off-by: Andreas Sturmlechner + +Downloaded from Gentoo commit +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d125dc0333e62fccb360f5918b044aa4bdf978 + +Upstream: https://github.com/lipnitsk/libcue/pull/73 + +Signed-off-by: Bernd Kuhls +[backported to 2.3.0] +--- + CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4f9d8e..0d3cb04 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,10 +1,14 @@ ++CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR) ++ ++if (POLICY CMP0145) ++ cmake_policy(SET CMP0145 OLD) # since 3.27 ++endif() ++ + SET(PACKAGE libcue) + SET(PACKAGE_NAME libcue) + SET(PACKAGE_VERSION 2.3.0) + SET(PACKAGE_SOVERSION 2) + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) +- + PROJECT(libcue C) + + include(GNUInstallDirs) +-- +2.47.3 + diff --git a/package/libebml/0001-drop-CMake-older-than-3.5.patch b/package/libebml/0001-drop-CMake-older-than-3.5.patch new file mode 100644 index 0000000000..3a9098f6b3 --- /dev/null +++ b/package/libebml/0001-drop-CMake-older-than-3.5.patch @@ -0,0 +1,29 @@ +From 6725c5f0169981cb0bd2ee124fbf0d8ca30b762d Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Sat, 24 Feb 2024 08:33:56 +0100 +Subject: [PATCH] drop CMake older than 3.5 + +It generates a warning with newer versions of CMake. +3.4 was released in 2015. We require C++17 with compilers only available in 2017/2018. +If your CMake is older than your toolchain, you have a problem. + +There's no need to support legacy CMake going forward in libebml 2. + +Upstream: https://github.com/Matroska-Org/libebml/commit/6725c5f0169981cb0bd2ee124fbf0d8ca30b762d + +Signed-off-by: Bernd Kuhls +[backported to version 1.4.5] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11ee059a..c7b969a8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.2) ++cmake_minimum_required(VERSION 3.5) + + project(ebml VERSION 1.4.5) + diff --git a/package/libmatroska/0001-drop-CMake-older-than-3.5.patch b/package/libmatroska/0001-drop-CMake-older-than-3.5.patch new file mode 100644 index 0000000000..25e09ed7bc --- /dev/null +++ b/package/libmatroska/0001-drop-CMake-older-than-3.5.patch @@ -0,0 +1,29 @@ +From dc80e194e93e6f0e25c8ad3e015d83aca2a99e10 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Sat, 24 Feb 2024 08:38:00 +0100 +Subject: [PATCH] drop CMake older than 3.5 + +It generates a warning with newer versions of CMake. +3.4 was released in 2015. We require C++17 with compilers only available in 2017/2018. +If your CMake is older than your toolchain, you have a problem. + +There's no need to support legacy CMake going forward in libebml 2/libmatroska 2. + +Upstream: https://github.com/Matroska-Org/libmatroska/commit/dc80e194e93e6f0e25c8ad3e015d83aca2a99e10 + +Signed-off-by: Bernd Kuhls +[backported to version 1.7.1] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 221c8ac6..97b392e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.2) ++cmake_minimum_required(VERSION 3.5) + + project(matroska VERSION 1.7.1) + diff --git a/package/libmodplug/0002-Fix-build-with-cmake-4.patch b/package/libmodplug/0002-Fix-build-with-cmake-4.patch new file mode 100644 index 0000000000..7c75d510c2 --- /dev/null +++ b/package/libmodplug/0002-Fix-build-with-cmake-4.patch @@ -0,0 +1,36 @@ +From a133c89548383f88fe0d0da618ef3c06c7f08f22 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 2 Dec 2025 18:00:15 +0100 +Subject: [PATCH] Fix build with cmake 4 + +Fixes build error with cmake 4.20: + +CMake Error at CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Upstream: https://github.com/Konstanty/libmodplug/pull/101 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9fd20d..9f9c94f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.12) + + project(libmodplug) + +-- +2.47.3 + diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 172778540e..9148cf393e 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.37/src/SHA256SUMS -sha256 5f9344ed0e31855bd38f88b33c9d9ab94f70ce547ef3213e488d1520f61840fa nspr-4.37.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.38.2/src/SHA256SUMS +sha256 e4092faeab77bdc9b32db1113e4215948ee768e26c4666db3b5a60b35f2c9105 nspr-4.38.2.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index a045140743..3c7351c2d7 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.37 +LIBNSPR_VERSION = 4.38.2 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index cf339697ea..1b15364a93 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_117_RTM/src/SHA256SUMS -sha256 5786b523a2f2e9295ed10d711960d2e33cd620bb80d6288443eda43553a51996 nss-3.117.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_RTM/src/SHA256SUMS +sha256 e8412db6c9d6f531e8adfe8a122ec33a8fae920681ff47231a1349bdd399f0e9 nss-3.119.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 8ba82dd6e2..4a9386d3a5 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.117 +LIBNSS_VERSION = 3.119 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist diff --git a/package/libosmium/0001-Require-a-more-modern-CMake.patch b/package/libosmium/0001-Require-a-more-modern-CMake.patch new file mode 100644 index 0000000000..6c39e751fb --- /dev/null +++ b/package/libosmium/0001-Require-a-more-modern-CMake.patch @@ -0,0 +1,45 @@ +From 7ab87418a0697ac9b7b5f005fbd64dcd99a01124 Mon Sep 17 00:00:00 2001 +From: Jochen Topf +Date: Tue, 15 Jul 2025 17:19:57 +0200 +Subject: [PATCH] Require a more modern CMake + +So it works with CMake 4 + +See #391 + +Upstream: https://github.com/osmcode/libosmium/commit/7ab87418a0697ac9b7b5f005fbd64dcd99a01124 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cfeffa8e..80f6bfe1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + # + #----------------------------------------------------------------------------- + +-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + + +@@ -36,14 +36,7 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel;Dev;Cover + # + #----------------------------------------------------------------------------- + +-project(libosmium) +- +-set(LIBOSMIUM_VERSION_MAJOR 2) +-set(LIBOSMIUM_VERSION_MINOR 22) +-set(LIBOSMIUM_VERSION_PATCH 0) +- +-set(LIBOSMIUM_VERSION +- "${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH}") ++project(libosmium VERSION 2.22.0 LANGUAGES CXX C) + + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in index 7de91c07c5..18d4a76cb3 100644 --- a/package/libseccomp/Config.in +++ b/package/libseccomp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_arm || BR2_armeb + default y if BR2_loongarch64 default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index b80efd68f5..aaadc8424e 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,4 +1,4 @@ -# From https://github.com/seccomp/libseccomp/releases/tag/v2.5.5 -sha256 248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375 libseccomp-2.5.5.tar.gz +# From https://github.com/seccomp/libseccomp/releases/tag/v2.6.0 (PGP-signed checksum) +sha256 83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc libseccomp-2.6.0.tar.gz # Locally calculated sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index 10d57bb78c..26585b1887 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSECCOMP_VERSION = 2.5.5 +LIBSECCOMP_VERSION = 2.6.0 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE diff --git a/package/libsoxr/0002-allow-compile-with-cmake-4.0.0.patch b/package/libsoxr/0002-allow-compile-with-cmake-4.0.0.patch new file mode 100644 index 0000000000..34ec44b671 --- /dev/null +++ b/package/libsoxr/0002-allow-compile-with-cmake-4.0.0.patch @@ -0,0 +1,28 @@ +From c157f862ecca9a0613e25c2058aceb127ee4ea4f Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 28 Mar 2025 13:47:55 +0000 +Subject: [PATCH] allow compile with cmake 4.0.0 + +Upstream: https://sourceforge.net/p/soxr/code/merge-requests/6/ + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ee48f6c..2eea1e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + # SoX Resampler Library Copyright (c) 2007-18 robs@users.sourceforge.net + # Licence for this file: LGPL v2.1 See LICENCE for details. + +-cmake_minimum_required (VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.1...3.10 FATAL_ERROR) + + project (soxr C) + set (DESCRIPTION_SUMMARY +-- +2.47.3 + diff --git a/package/libubox/Config.in b/package/libubox/Config.in index 1f0b691e13..09d6336706 100644 --- a/package/libubox/Config.in +++ b/package/libubox/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_LIBUBOX bool "libubox" depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_JSON_C help This library originates from the OpenWrt project to handle the configuration file infrastructure, but can @@ -11,3 +13,4 @@ config BR2_PACKAGE_LIBUBOX comment "libubox needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/libubox/libubox.hash b/package/libubox/libubox.hash index eb37d33230..127abf432c 100644 --- a/package/libubox/libubox.hash +++ b/package/libubox/libubox.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 df6e1350fd11016ef30242a279cec195d91e6748c11c40e0991593718c46fa52 libubox-3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a-git4.tar.gz +sha256 c4432d4f902bd0a2974d3fe76620bbb5e04b9d52e55701829aa12507651bc4d9 libubox-ecddb31dc34d89be5c9dc4595a4c58070eb090e4-git4.tar.gz diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 00ae2b0595..8710720287 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBUBOX_VERSION = 3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a +LIBUBOX_VERSION = ecddb31dc34d89be5c9dc4595a4c58070eb090e4 LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause LIBUBOX_INSTALL_STAGING = YES -LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) +LIBUBOX_DEPENDENCIES = json-c ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy) LIBUBOX_DEPENDENCIES += lua diff --git a/package/libuci/Config.in b/package/libuci/Config.in index f94d7dc391..25c248751c 100644 --- a/package/libuci/Config.in +++ b/package/libuci/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUCI bool "libuci" depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libubox -> json-c select BR2_PACKAGE_LIBUBOX help This library originates from the OpenWrt project to @@ -14,3 +15,4 @@ config BR2_PACKAGE_LIBUCI comment "libuci needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/libuecc/0001-Fix-build-with-CMake-4.patch b/package/libuecc/0001-Fix-build-with-CMake-4.patch new file mode 100644 index 0000000000..ecd54b4836 --- /dev/null +++ b/package/libuecc/0001-Fix-build-with-CMake-4.patch @@ -0,0 +1,158 @@ +From b3812bf5ab1777193c4b85863311c33997d141f9 Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann +Date: Mon, 1 Sep 2025 10:21:38 +0200 +Subject: [PATCH] Fix build with CMake 4 + +CMake 4 dropped support for policies which were introduced before version +3.5. Trying to build uisng cmake 4 results in: + + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Just increasing minimum version to 3.18 (from 2020-07-15) fixes this +problem. This version is low enough to still support Debian bullseye or +Ubuntu 22.04. + +With this version increase, following policies are enabled + +* 3.18 + - CMP0108: A target cannot link to itself through an alias. + - CMP0107: An ALIAS target cannot overwrite another target. + - CMP0106: The Documentation module is removed. + - CMP0105: Device link step uses the link options. + - CMP0104: CMAKE_CUDA_ARCHITECTURES now detected for NVCC, empty CUDA_ARCHITECTURES not allowed. + - CMP0103: Multiple export() with same FILE without APPEND is not allowed. +* 3.17 + - CMP0102: mark_as_advanced() does nothing if a cache entry does not exist. + - CMP0101: target_compile_options honors BEFORE keyword in all scopes. + - CMP0100: Let AUTOMOC and AUTOUIC process .hh header files. + - CMP0099: Link properties are transitive over private dependencies of static libraries. + - CMP0098: FindFLEX runs flex in CMAKE_CURRENT_BINARY_DIR when executing. +* 3.16 + - CMP0097: ExternalProject_Add with GIT_SUBMODULES "" initializes no submodules. + - CMP0096: project() preserves leading zeros in version components. + - CMP0095: RPATH entries are properly escaped in the intermediary CMake install script. +* 3.15 + - CMP0094: FindPython3, FindPython2 and FindPython use LOCATION for lookup strategy. + - CMP0093: FindBoost reports Boost_VERSION in x.y.z format. + - CMP0092: MSVC warning flags are not in CMAKE_{C,CXX}_FLAGS by default. + - CMP0091: MSVC runtime library flags are selected by an abstraction. + - CMP0090: export(PACKAGE) does not populate package registry by default. + - CMP0089: Compiler id for IBM Clang-based XL compilers is now XLClang. +* 3.14 + - CMP0088: FindBISON runs bison in CMAKE_CURRENT_BINARY_DIR when executing. + - CMP0087: install(SCRIPT | CODE) supports generator expressions. + - CMP0086: UseSWIG honors SWIG_MODULE_NAME via -module flag. + - CMP0085: IN_LIST generator expression handles empty list items. + - CMP0084: The FindQt module does not exist for find_package(). + - CMP0083: Add PIE options when linking executable. + - CMP0082: Install rules from add_subdirectory() are interleaved with those in caller. +* 3.13 + - CMP0081: Relative paths not allowed in LINK_DIRECTORIES target property. + - CMP0080: BundleUtilities cannot be included at configure time. + - CMP0079: target_link_libraries allows use with targets in other directories. + - CMP0078: UseSWIG generates standard target names. + - CMP0077: option() honors normal variables. + - CMP0076: target_sources() command converts relative paths to absolute. +* 3.12 + - CMP0075: Include file check macros honor CMAKE_REQUIRED_LIBRARIES. + - CMP0074: find_package uses PackageName_ROOT variables. + - CMP0073: Do not produce legacy _LIB_DEPENDS cache entries. +* 3.11 + - CMP0072: FindOpenGL prefers GLVND by default when available. +* 3.10 + - CMP0071: Let AUTOMOC and AUTOUIC process GENERATED files. + - CMP0070: Define file(GENERATE) behavior for relative paths. +* 3.9 + - CMP0069: INTERPROCEDURAL_OPTIMIZATION is enforced when enabled. + - CMP0068: RPATH settings on macOS do not affect install_name. +* 3.8 + - CMP0067: Honor language standard in try_compile() source-file signature. +* 3.7 + - CMP0066: Honor per-config flags in try_compile() source-file signature. +* 3.4 + - CMP0065: Do not add flags to export symbols from executables without the ENABLE_EXPORTS target property. + - CMP0064: Support new TEST if() operator. +* 3.3 + - CMP0063: Honor visibility properties for all target types. + - CMP0062: Disallow install() of export() result. + - CMP0061: CTest does not by default tell make to ignore errors (-i). + - CMP0060: Link libraries by full path even in implicit directories. + - CMP0059: Do not treat DEFINITIONS as a built-in directory property. + - CMP0058: Ninja requires custom command byproducts to be explicit. + - CMP0057: Support new IN_LIST if() operator. +* 3.2 + - CMP0056: Honor link flags in try_compile() source-file signature. + - CMP0055: Strict checking for break() command. +* 3.1 + - CMP0054: Only interpret if() arguments as variables or keywords when unquoted. + - CMP0053: Simplify variable reference and escape sequence evaluation. + - CMP0052: Reject source and build dirs in installed INTERFACE_INCLUDE_DIRECTORIES. + - CMP0051: List TARGET_OBJECTS in SOURCES target property. +* 3.0 + - CMP0050: Disallow add_custom_command SOURCE signatures. + - CMP0049: Do not expand variables in target source entries. + - CMP0048: project() command manages VERSION variables. + - CMP0047: Use QCC compiler id for the qcc drivers on QNX. + - CMP0046: Error on non-existent dependency in add_dependencies. + - CMP0045: Error on non-existent target in get_target_property. + - CMP0044: Case sensitive Lang_COMPILER_ID generator expressions. + - CMP0043: Ignore COMPILE_DEFINITIONS_Config properties. + - CMP0042: MACOSX_RPATH is enabled by default. + - CMP0041: Error on relative include with generator expression. + - CMP0040: The target in the TARGET signature of add_custom_command() must exist. + - CMP0039: Utility targets may not have link dependencies. + - CMP0038: Targets may not link directly to themselves. + - CMP0037: Target names should not be reserved and should match a validity pattern. + - CMP0036: The build_name command should not be called. + - CMP0035: The variable_requires command should not be called. + - CMP0034: The utility_source command should not be called. + - CMP0033: The export_library_dependencies command should not be called. + - CMP0032: The output_required_files command should not be called. + - CMP0031: The load_command command should not be called. + - CMP0030: The use_mangled_mesa command should not be called. + - CMP0029: The subdir_depends command should not be called. + - CMP0028: Double colon in target name means ALIAS or IMPORTED target. + - CMP0027: Conditionally linked imported targets with missing include directories. + - CMP0026: Disallow use of the LOCATION target property. + - CMP0025: Compiler id for Apple Clang is now AppleClang. + - CMP0024: Disallow include export result. +* 2.8 + - CMP0023: Plain and keyword target_link_libraries signatures cannot be mixed. + - CMP0022: INTERFACE_LINK_LIBRARIES defines the link interface. + - CMP0021: Fatal error on relative paths in INCLUDE_DIRECTORIES target property. + - CMP0020: Automatically link Qt executables to qtmain target on Windows. + - CMP0019: Do not re-expand variables in include and link information. + - CMP0018: Ignore CMAKE_SHARED_LIBRARY_Lang_FLAGS variable. + - CMP0017: Prefer files from the CMake module directory when including from there. + - CMP0016: target_link_libraries() reports error if its only argument is not a target. + - CMP0015: link_directories() treats paths relative to the source dir. + - CMP0014: Input directories must have CMakeLists.txt. + - CMP0013: Duplicate binary directories are not allowed. + - CMP0012: if() recognizes numbers and boolean constants. + +Fixes: #1 +Signed-off-by: Sven Eckelmann + +Upstream: https://github.com/neocturne/libuecc/commit/b3812bf5ab1777193c4b85863311c33997d141f9 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 779ac41..24bded3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.18) + project(LIBUECC C) + set(PROJECT_VERSION 7) + diff --git a/package/libuhttpd/0001-fix-cmake-required-minimum-version.patch b/package/libuhttpd/0001-fix-cmake-required-minimum-version.patch new file mode 100644 index 0000000000..097a44cf85 --- /dev/null +++ b/package/libuhttpd/0001-fix-cmake-required-minimum-version.patch @@ -0,0 +1,34 @@ +From b9bf3936b3778912444eff7f7866db1d66f4c50b Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Sun, 6 Jul 2025 20:14:31 +0200 +Subject: [PATCH] fix: cmake required minimum version + +When trying to compile the project with CMake 4 the following error +shows up: + +CMake Error at CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + +This commit bump the minimum required cmake version to meet the needs of +CMake v4. + +For more information see: + - https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features + +Upstream: https://github.com/zhaojh329/libuhttpd/commit/b9bf3936b3778912444eff7f7866db1d66f4c50b + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6719e5f..0392f25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + + project(libuhttpd C) + diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 86437a7339..d04fbd5b98 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,5 @@ +# From https://sourceforge.net/projects/pupnp/files/release-1.14.25/ +sha1 664b3981f6a54dd3b921af4ab2ecdfb6d1feb626 libupnp-1.14.25.tar.bz2 # Locally computed: -sha256 b6423c573b758d09539f5e6c4712c1a9fd35dccf835f81d99473d50a50ad49b0 libupnp-1.14.19.tar.bz2 +sha256 36fdf15767573f4f92320f01b3fd3c1cb41732b91cfc24d10d1e6a55969c9f56 libupnp-1.14.25.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index cd148d14d0..f29275d2b5 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.19 +LIBUPNP_VERSION = 1.14.25 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ - http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) + https://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause diff --git a/package/liburing/Config.in b/package/liburing/Config.in index fc13f1c17c..29df944ce1 100644 --- a/package/liburing/Config.in +++ b/package/liburing/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBURING simplified interface for applications that don't need (or want) to deal with the full kernel side implementation. - https://git.kernel.dk/cgit/liburing + https://github.com/axboe/liburing comment "liburing needs a toolchain w/ gcc >= 4.9, headers >= 5.1" depends on BR2_USE_MMU diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash index f06dd187a7..d37b69497f 100644 --- a/package/liburing/liburing.hash +++ b/package/liburing/liburing.hash @@ -1,8 +1,8 @@ # Locally calculated -sha256 78bcc0dc0d004a238d8b5f597adbb4ec74926352a3983b872db7f0efdb72565d liburing-2.6.tar.bz2 +sha256 f1d10cb058c97c953b4c0c446b11e9177e8c8b32a5a88b309f23fdd389e26370 liburing-2.12.tar.gz # Hash for license files sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 2ec12f7934cdfce25ff72b0557738989d79fc7a496d1cf9b2d3f9464fd61edbe LICENSE -sha256 b0731ca09e6f4718d456a989d32b6c61bf27e5d4bab6ca31e409d75c5120d19e README +sha256 d98e81bb7a8fcfb5506f02c3190b5bc2e286970591072edc4575c26624d827dd README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index fc3993b38c..24ceb281b5 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBURING_VERSION = 2.6 -LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 -LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot +LIBURING_VERSION = liburing-2.12 +LIBURING_SOURCE = $(LIBURING_VERSION).tar.gz +LIBURING_SITE = $(call github,axboe,liburing,$(LIBURING_VERSION)) LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README LIBURING_INSTALL_STAGING = YES diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index fe2c7a2815..0168f1d83c 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -122,6 +122,7 @@ config BR2_PACKAGE_LIGHTTPD_PCRE config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -133,6 +134,7 @@ config BR2_PACKAGE_LIGHTTPD_PGSQL comment "pgsql support needs a toolchain w/ wchar" depends on BR2_USE_MMU + depends on !BR2_sparc depends on !BR2_USE_WCHAR comment "pgsql support can't be built with Optimize for fast" diff --git a/package/llama-cpp/llama-cpp.hash b/package/llama-cpp/llama-cpp.hash index 81ddf4508f..765025f180 100644 --- a/package/llama-cpp/llama-cpp.hash +++ b/package/llama-cpp/llama-cpp.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c108fadd61d34da6ff2cfdf085821ff03a45acde2245d9eeeba9358482b305c3 b6865.tar.gz +sha256 b2c4c89b6282c4ddc7c9c00c79af77d84811b6092aa47838a194e8a2981fa104 b7271.tar.gz # License sha256 e562a2ddfaf8280537795ac5ecd34e3012b6582a147ef69ba6a6a5c08c84757d LICENSE diff --git a/package/llama-cpp/llama-cpp.mk b/package/llama-cpp/llama-cpp.mk index 7554d80a1e..5112022656 100644 --- a/package/llama-cpp/llama-cpp.mk +++ b/package/llama-cpp/llama-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLAMA_CPP_VERSION = b6865 +LLAMA_CPP_VERSION = b7271 LLAMA_CPP_SOURCE = $(LLAMA_CPP_VERSION).tar.gz LLAMA_CPP_SITE = https://github.com/ggml-org/llama.cpp/archive/refs/tags LLAMA_CPP_LICENSE = MIT diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash index 5ac73a252c..72efe1e09d 100644 --- a/package/llvm-project/clang/clang.hash +++ b/package/llvm-project/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 348ace5d715c4caa6fb89b4c6fe07c21650e10b2fac37d8b0db75c0b11be9011 clang-21.1.6.src.tar.xz +sha256 eeb5296f46eacc0a1fe6c47a1af9e8d4eb2a5da7254fd8dbc4fc1f1be74315a1 clang-21.1.7.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash index b9ec906595..47a90af9be 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.hash +++ b/package/llvm-project/compiler-rt/compiler-rt.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 bdd904f3aac9f4c4424f3440aff498cc04d66f243e37156b6d167ffb7b599f89 compiler-rt-21.1.6.src.tar.xz -sha256 8d09dc219cdb3da7dafd2161836aacdd6e02c1a113498ab5f37688599406dc8a third-party-21.1.6.src.tar.xz +sha256 4358e4476ab89b6ca9e4174f05f4a2c2c10e4a41c3c7febd25afe96bc27b5758 compiler-rt-21.1.7.src.tar.xz +sha256 5fe212feb27f325fa29530eb38e746a73d18205bf6a36d9800778a94108d2ee5 third-party-21.1.7.src.tar.xz sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/llvm-project/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash index 92b51fc1fa..41c440cebc 100644 --- a/package/llvm-project/libclc/libclc.hash +++ b/package/llvm-project/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 a1a09ccfa17f2d5fbe5e54271a4a9fbe396950f29f80f52b67a7083fee73120c libclc-21.1.6.src.tar.xz +sha256 de1c8dbffdce898a4c5e70fb7f5aa6dea1e429f63471773da8cb3cdf9e945403 libclc-21.1.7.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash index b05f1e30f9..d3a2d22b68 100644 --- a/package/llvm-project/lld/lld.hash +++ b/package/llvm-project/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5b297faecdddc9581c260a1570b4c0ec8810d1213e23d7aa84732c0e2feea85f lld-21.1.6.src.tar.xz +sha256 607395fc8a5f4d14eb27b219a279558a172d1e3a34ddd2a3509c12b560f1930a lld-21.1.7.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash index 402a5f4ef7..ae2d1737d1 100644 --- a/package/llvm-project/llvm-cmake/llvm-cmake.hash +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash @@ -1,2 +1,2 @@ # locally calculated -sha256 e364f135fa14c343d70cac96f577f44e8e20bf026682f647f8c3c5687a0bebd1 cmake-21.1.6.src.tar.xz +sha256 f25ca011e4453ac035e940aa729d482d08eb83a91b4aaf1f230dc9ea28cadfa4 cmake-21.1.7.src.tar.xz diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash index 7326a0d863..e34c79b728 100644 --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash @@ -1,3 +1,3 @@ # locally computed -sha256 25d8bf5bd0d95641c738ea690b18564f5fc9fb7e7bbab17329b391988e71ae8c libunwind-21.1.6.src.tar.xz +sha256 ac6ac43b6d54c6f6725a286ce36acff7a94123a8f2a54c161f866b94fcaa3a9b libunwind-21.1.7.src.tar.xz sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk index 268367d6bd..15b1076d82 100644 --- a/package/llvm-project/llvm-project.mk +++ b/package/llvm-project/llvm-project.mk @@ -5,7 +5,7 @@ ################################################################################ LLVM_PROJECT_VERSION_MAJOR = 21 -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.6 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.7 LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) include $(sort $(wildcard package/llvm-project/*/*.mk)) diff --git a/package/llvm-project/llvm-runtimes/llvm-runtimes.hash b/package/llvm-project/llvm-runtimes/llvm-runtimes.hash index c68f1c13ff..9f2784b731 100644 --- a/package/llvm-project/llvm-runtimes/llvm-runtimes.hash +++ b/package/llvm-project/llvm-runtimes/llvm-runtimes.hash @@ -1,2 +1,2 @@ # locally calculated -sha256 3b2dcaec1163caf067988228c1d21a75334c47d22610956dd9699ea0631bce45 runtimes-21.1.6.src.tar.xz +sha256 7f87971685100bc2bd0fe54042c5140da100b0e37fa12fca888cf1d8d06a8e25 runtimes-21.1.7.src.tar.xz diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash index 1738c94d29..afa270b83e 100644 --- a/package/llvm-project/llvm/llvm.hash +++ b/package/llvm-project/llvm/llvm.hash @@ -1,4 +1,4 @@ # locally calculated -sha256 908bce97be0275943414b45af2e2b20e8f6d5d9266fdc120bd59f096ebc547ad llvm-21.1.6.src.tar.xz -sha256 8d09dc219cdb3da7dafd2161836aacdd6e02c1a113498ab5f37688599406dc8a third-party-21.1.6.src.tar.xz +sha256 8657ee188b673a3285b991131abe905b4129a18d52d334f9d122463164ecd000 llvm-21.1.7.src.tar.xz +sha256 5fe212feb27f325fa29530eb38e746a73d18205bf6a36d9800778a94108d2ee5 third-party-21.1.7.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/log4qt/0001-Use-3.10-as-minimum-required-cmake-version.patch b/package/log4qt/0001-Use-3.10-as-minimum-required-cmake-version.patch new file mode 100644 index 0000000000..311366b851 --- /dev/null +++ b/package/log4qt/0001-Use-3.10-as-minimum-required-cmake-version.patch @@ -0,0 +1,28 @@ +From dd869e9c5a5e2d306b930b00487a488441131d9a Mon Sep 17 00:00:00 2001 +From: Johann Anhofer +Date: Wed, 26 Feb 2025 15:41:20 +0100 +Subject: [PATCH] Use 3.10 as minimum required cmake version set cmake policy + CMP0071 to new (AUTOMOC, AUTOUIC) + +Upstream: https://github.com/MEONMedical/Log4Qt/commit/dd869e9c5a5e2d306b930b00487a488441131d9a + +Signed-off-by: Bernd Kuhls +[backported for version 1.5.1] +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf99ad8..2a02433 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,8 @@ +-cmake_minimum_required(VERSION 3.3.0) ++cmake_minimum_required(VERSION 3.10) + project(Log4Qt VERSION 1.5.1) ++if(POLICY CMP0071) ++ cmake_policy(SET CMP0071 NEW) ++endif() + + # + # in-source builds should be avoided diff --git a/package/lugaru/0003-Revert-Set-CMP0004-policy-to-OLD.patch b/package/lugaru/0003-Revert-Set-CMP0004-policy-to-OLD.patch new file mode 100644 index 0000000000..a8359f9e69 --- /dev/null +++ b/package/lugaru/0003-Revert-Set-CMP0004-policy-to-OLD.patch @@ -0,0 +1,31 @@ +From 165a34a5ca8a712be405fefffcccdb5845f230e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= +Date: Sat, 7 Jul 2018 11:52:28 +0200 +Subject: [PATCH] Revert "Set CMP0004 policy to OLD" + +This reverts commit b461f4a69c17073d5c576d24e48b1b59c0d3c932. +The workaround is no longer needed with SDL 2.0.5+, which is shipped +in all distros we support (including Debian Stable and RHEL 7). + +Fixes #99. + +Upstream: https://github.com/osslugaru/lugaru/commit/165a34a5ca8a712be405fefffcccdb5845f230e3 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29141271..3973d362 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ + project(lugaru) + +-cmake_minimum_required(VERSION 3.0) +-cmake_policy(SET CMP0004 OLD) ++cmake_minimum_required(VERSION 3.5) + + include(FindPkgConfig) + include(GNUInstallDirs) diff --git a/package/mariadb/0002-cmake-version-REQUIRES.patch b/package/mariadb/0002-cmake-version-REQUIRES.patch new file mode 100644 index 0000000000..6c776f5d63 --- /dev/null +++ b/package/mariadb/0002-cmake-version-REQUIRES.patch @@ -0,0 +1,25 @@ +From 726cc3684b4de08934c2b14f347799fd8c3aac9a Mon Sep 17 00:00:00 2001 +From: Leonid Fedorov +Date: Tue, 30 Aug 2022 22:41:44 +0000 +Subject: [PATCH] Proper external_boost for storage manager, cmake version + REQUIRES + +Upstream: https://github.com/mariadb-corporation/mariadb-columnstore-engine/commit/726cc3684b4de08934c2b14f347799fd8c3aac9a + +Signed-off-by: Bernd Kuhls +[partial backport for 10.11.15] +--- + storage/columnstore/columnstore/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0be025103b..15f0eb0f48 100644 +--- a/storage/columnstore/columnstore/CMakeLists.txt ++++ b/storage/columnstore/columnstore/CMakeLists.txt +@@ -1,5 +1,5 @@ + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.12) + + PROJECT(Columnstore) + diff --git a/package/mbpoll/0002-cmake-Set-minimum-required-version-to-3.5.patch b/package/mbpoll/0002-cmake-Set-minimum-required-version-to-3.5.patch new file mode 100644 index 0000000000..0df22ddedd --- /dev/null +++ b/package/mbpoll/0002-cmake-Set-minimum-required-version-to-3.5.patch @@ -0,0 +1,41 @@ +From baad0efca89f0d8fe370591283d87a6e8e7dee4c Mon Sep 17 00:00:00 2001 +From: Alper Ak +Date: Mon, 7 Jul 2025 20:05:36 +0300 +Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ + compatibility + +Fix: + +| CMake Error at CMakeLists.txt:3 (cmake_minimum_required): +| Compatibility with CMake < 3.5 has been removed from CMake. +| +| Update the VERSION argument value. Or, use the ... syntax +| to tell CMake that the project requires at least but has been updated +| to work with policies introduced by or earlier. +| +| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. +| +| +| -- Configuring incomplete, errors occurred! + +Signed-off-by: Alper Ak + +Upstream: https://github.com/epsilonrt/mbpoll/commit/baad0efca89f0d8fe370591283d87a6e8e7dee4c + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11dcd05..d72c5ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + # -*- CMakeLists.txt generated by CodeLite IDE. Do not edit by hand -*- + +-cmake_minimum_required(VERSION 2.9) ++cmake_minimum_required(VERSION 3.5) + + # Workspace name + project(mbpoll LANGUAGES C) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 75d7405504..39564b6af3 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 25.2.7 +MESA3D_HEADERS_VERSION = 25.3.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index 52e23e35da..f2596a9e87 100644 --- a/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -10,7 +10,7 @@ to force disabling it at compile time. Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 Signed-off-by: Peter Seiderer Signed-off-by: Bernd Kuhls -[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0, 24.3.0, 25.1.0 & 25.2.0] +[rebased for 25.3.0] Signed-off-by: Peter Seiderer [fix syntax error after previous rebases] --- @@ -23,7 +23,7 @@ diff --git a/meson.options b/meson.options index 8e0bf2a..1cf0e07 100644 --- a/meson.options +++ b/meson.options -@@ -131,6 +131,13 @@ option( +@@ -123,6 +123,13 @@ option( description : 'enable gallium mediafoundation frontend tests.', ) @@ -50,11 +50,10 @@ index 84da951..7f950de 100644 libvc4_neon = static_library( 'vc4_neon', 'vc4_tiling_lt.c', -@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' +@@ -82,6 +82,7 @@ c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'], dependencies : vc4_deps, ) -- vc4_c_args += '-DUSE_ARM_ASM' + vc4_c_args += '-DVC4_TILING_LT_NEON' endif @@ -63,20 +62,20 @@ diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_ index 5afe329..919b299 100644 --- a/src/gallium/drivers/vc4/vc4_tiling.h +++ b/src/gallium/drivers/vc4/vc4_tiling.h -@@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, +@@ -90,7 +90,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, void *src, uint32_t src_stride, int cpp, const struct pipe_box *box) { --#ifdef USE_ARM_ASM +-#if DETECT_ARCH_ARM +#ifdef VC4_TILING_LT_NEON if (util_get_cpu_caps()->has_neon) { vc4_load_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box); -@@ -105,7 +105,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride, +@@ -106,7 +106,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride, void *src, uint32_t src_stride, int cpp, const struct pipe_box *box) { --#ifdef USE_ARM_ASM +-#if DETECT_ARCH_ARM +#ifdef VC4_TILING_LT_NEON if (util_get_cpu_caps()->has_neon) { vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, diff --git a/package/mesa3d/0003-Fix-uClibc-build.patch b/package/mesa3d/0003-Fix-uClibc-build.patch index faa86b0d1b..d8cd50024c 100644 --- a/package/mesa3d/0003-Fix-uClibc-build.patch +++ b/package/mesa3d/0003-Fix-uClibc-build.patch @@ -25,9 +25,8 @@ Fixes build errors with uClibc and gcc-9.3.0: Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 -Signed-off-by: Bernd Kuhls -[rebased for 23.2.0] Signed-off-by: Bernd Kuhls +[rebased for 25.3.0] --- src/util/compiler.h | 10 ++++++++++ src/util/macros.h | 1 + @@ -59,10 +58,10 @@ diff --git a/src/util/macros.h b/src/util/macros.h index 22b18303826..8f73ee72693 100644 --- a/src/util/macros.h +++ b/src/util/macros.h -@@ -31,6 +31,7 @@ - #include +@@ -32,6 +32,7 @@ #include #include + #include +#include "util/compiler.h" #ifdef _GAMING_XBOX diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index d2003fce42..94d88dd8db 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -102,7 +102,7 @@ config BR2_PACKAGE_MESA3D_DRIVER bool select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 -# OpenGL GLX and Gallium VDPAU both needs X11 +# OpenGL GLX needs X11 config BR2_PACKAGE_MESA3D_NEEDS_X11 bool depends on BR2_PACKAGE_XORG7 @@ -322,24 +322,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK providing OpenGL support on devices that only support Vulkan. -config BR2_PACKAGE_MESA3D_VDPAU - bool "Gallium VDPAU state tracker" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI - select BR2_PACKAGE_MESA3D_NEEDS_X11 - select BR2_PACKAGE_LIBVDPAU - help - VDPAU state tracker (needs r300, r600, radeonsi or nouveau - gallium drivers). - -comment "Gallium VDPAU state tracker needs X.org and gallium drivers r600, radeonsi or nouveau" - depends on !BR2_PACKAGE_XORG7 || \ - !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) - comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e2b3d9ca79..4bfc1d4584 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2025-November/000828.html -sha256 b40232a642011820211aab5a9cdf754e106b0bce15044bc4496b0ac9615892ad mesa-25.2.7.tar.xz -sha512 87dd815e0d11d6ec0eb969ee93d3f376103bb899d90599e0b7902394e41c58139384df79f89633e132ca969348d3320f55308a74651d409b454d51f1bcda27bc mesa-25.2.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2025-December/000829.html +sha256 059d0d985622f49588f01aa29152804f4da8ffe6add046e00a52923379c2d8da mesa-25.3.1.tar.xz +sha512 7e2f7295f1f4df129935b60d75c890f6ae585ecc511f69f55a61826df5f2434ffdb4109c632af9842a986bf9beed430a0404d377e8335b71fa36682bd10533ba mesa-25.3.1.tar.xz # License sha256 0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615 docs/license.rst sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f licenses/MIT diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5305ea2de1..6fcbf96c80 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 25.2.7 +MESA3D_VERSION = 25.3.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -159,11 +159,18 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ + -Ddisplay-info=disabled \ -Dvulkan-drivers= else MESA3D_DEPENDENCIES += host-python-glslang MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) +ifeq ($(BR2_PACKAGE_LIBDISPLAY_INFO),y) +MESA3D_DEPENDENCIES += libdisplay-info +MESA3D_CONF_OPTS += -Ddisplay-info=enabled +else +MESA3D_CONF_OPTS += -Ddisplay-info=disabled +endif endif # APIs @@ -245,13 +252,6 @@ else MESA3D_CONF_OPTS += -Dlibunwind=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VDPAU),y) -MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += -Dgallium-vdpau=enabled -else -MESA3D_CONF_OPTS += -Dgallium-vdpau=disabled -endif - ifeq ($(BR2_PACKAGE_LM_SENSORS),y) MESA3D_CONF_OPTS += -Dlmsensors=enabled MESA3D_DEPENDENCIES += lm-sensors @@ -287,7 +287,6 @@ endif HOST_MESA3D_CONF_OPTS = \ -Dglvnd=disabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(HOST_MESA3D_GALLIUM_DRIVERS-y)) \ - -Dgallium-vdpau=disabled \ -Dinstall-mesa-clc=true \ -Dmesa-clc=enabled \ -Dplatforms= \ diff --git a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch index c7f8557ec1..92d5e517a4 100644 --- a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch +++ b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch @@ -24,8 +24,7 @@ http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba Signed-off-by: Matthew Weber [Updated for 0.57.1 - get_builtin_option() vs. get_option(OptionKey())] Signed-off-by: Peter Seiderer -[Bernd: rebased for 1.6.0 & 1.7.0 - for 1.82.0 - get_option -> optstore.get_value_for] +[Bernd: rebased for 1.10.0] Signed-off-by: Bernd Kuhls --- mesonbuild/compilers/mixins/clike.py | 3 +++ @@ -43,16 +42,16 @@ index 09ad837b1..b7f6b9f22 100644 from .. import compilers from ..compilers import CompileCheckMode from .visualstudio import VisualStudioLikeCompiler -@@ -1053,6 +1054,9 @@ class CLikeCompiler(Compiler): +@@ -1045,6 +1046,9 @@ class CLikeCompiler(Compiler): # TI C28x compilers can use both extensions for static or dynamic libs. stlibext = ['a', 'lib'] shlibext = ['dll', 'so'] -+ elif env.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static': ++ elif self.environment.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static': + # Linux/BSDs + shlibext = ['a'] - else: - # Linux/BSDs - shlibext = ['so'] + elif self.info.is_os2(): + stlibext = ['_s.lib', '_s.a', 'lib', 'a'] + shlibext = ['_dll.lib', '_dll.a', 'lib', 'a', 'dll'] -- 2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c83daae6c9..d07ea4d1dd 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.8.3/meson-1.8.3.tar.gz.asc -sha256 f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf meson-1.8.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.10.0/meson-1.10.0.tar.gz.asc +sha256 8071860c1f46a75ea34801490fd1c445c9d75147a65508cd3a10366a7006cc1c meson-1.10.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 0c460eca6f..ca42edf63b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.8.3 +MESON_VERSION = 1.10.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/package/mraa/0003-cmake-bump-minimum-version.patch b/package/mraa/0003-cmake-bump-minimum-version.patch new file mode 100644 index 0000000000..8cad2b7ba1 --- /dev/null +++ b/package/mraa/0003-cmake-bump-minimum-version.patch @@ -0,0 +1,46 @@ +From 92a1337e110464bbb3aaba2b3ede77dc13b3f175 Mon Sep 17 00:00:00 2001 +From: Alex T +Date: Sun, 2 Nov 2025 19:06:06 +0100 +Subject: [PATCH] cmake: bump minimum version to address a deprecation warning + +This fixes the following warning shown while configuring: + + [cmake] CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): + [cmake] Compatibility with CMake < 3.10 will be removed from a future version of + [cmake] CMake. + +We don't have a clearly defined supported distro/versions list, so I +took Ubuntu 22.04 as arguably the oldest one we'd want to support for +the reference point. It has CMake 3.22, released in July 2022. + +Signed-off-by: Alex T + +Upstream: https://github.com/eclipse/mraa/commit/92a1337e110464bbb3aaba2b3ede77dc13b3f175 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a13eeb81..34ded2b75 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,15 +1,9 @@ +-cmake_minimum_required (VERSION 2.8.11) ++cmake_minimum_required (VERSION 3.22) + project (mraa C) + + FIND_PACKAGE (Threads REQUIRED) + +-if (CMAKE_VERSION VERSION_LESS "3.1") +- if (CMAKE_C_COMPILER_ID STREQUAL "GNU") +- set (CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}") +- endif () +-else () +- set (CMAKE_C_STANDARD 99) +-endif () ++set (CMAKE_C_STANDARD 99) + + option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) + diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 714046414a..c8bdb0913f 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v8/nano-8.6.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.7.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 f7abfbf0eed5f573ab51bd77a458f32d82f9859c55e9689f819d96fe1437a619 nano-8.6.tar.xz +sha256 afd287aa672c48b8e1a93fdb6c6588453d527510d966822b687f2835f0d986e9 nano-8.7.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 183dc07e7e..ee82225a72 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 8 -NANO_VERSION = $(NANO_VERSION_MAJOR).6 +NANO_VERSION = $(NANO_VERSION_MAJOR).7 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index 57c10bb287..5e099de591 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz +sha256 974d6b2f4eeefa25625d34da3cb36bdcebe7fbce40f4c16ac0835fd1c0cbae17 ninja-1.13.2.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index 805fef4541..c59984b6bd 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,9 +4,8 @@ # ################################################################################ -NINJA_VERSION_MAJOR = 1.11.1 -NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 -NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) +NINJA_VERSION = 1.13.2 +NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 0123babe4b..1fad2163c8 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 05cb5fdf1ea33fcba719580b31a97feaa019c4a3050563e88bc3b34675e6fed4 openvpn-2.6.16.tar.gz +sha256 4cc8e63f710d3001493b13d8a32cf22a214d5e4f71dd37d93831e2fd3208b370 openvpn-2.6.17.tar.gz sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 0175c51d63..9740374bee 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.16 +OPENVPN_VERSION = 2.6.17 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash index 159a157a49..1c0938542c 100644 --- a/package/php-amqp/php-amqp.hash +++ b/package/php-amqp/php-amqp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2de740da9a884ade2caf0e59e5521bbf80da16155fa6a6205630b473aed5e6dd amqp-2.0.0.tgz +sha256 0cb16d63752a0055de55a22062a6c1744908696d92268d76181284669025d993 amqp-2.1.2.tgz sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk index 7e58234d1f..5507032ee1 100644 --- a/package/php-amqp/php-amqp.mk +++ b/package/php-amqp/php-amqp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_AMQP_VERSION = 2.0.0 +PHP_AMQP_VERSION = 2.1.2 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz PHP_AMQP_SITE = https://pecl.php.net/get PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-gnupg/php-gnupg.hash b/package/php-gnupg/php-gnupg.hash index 084de7750a..8bd2eb5c90 100644 --- a/package/php-gnupg/php-gnupg.hash +++ b/package/php-gnupg/php-gnupg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9906f465ab2343cb2f3127ee209c72760238745c34878d9bbc1576486219252 gnupg-1.5.1.tgz +sha256 4d4a0980759bf259e4129ef02cb592bbeb103b4005e7b4bb6945d79488951a50 gnupg-1.5.4.tgz sha256 da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9 LICENSE diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk index 89054f5f7c..6b76795533 100644 --- a/package/php-gnupg/php-gnupg.mk +++ b/package/php-gnupg/php-gnupg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_GNUPG_VERSION = 1.5.1 +PHP_GNUPG_VERSION = 1.5.4 PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz PHP_GNUPG_SITE = https://pecl.php.net/get # phpize does the autoconf magic diff --git a/package/php-memcached/php-memcached.hash b/package/php-memcached/php-memcached.hash index 162d25f795..08a90f13b4 100644 --- a/package/php-memcached/php-memcached.hash +++ b/package/php-memcached/php-memcached.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2a41143a7b29f4a962a3805b77aa207a99e4566e2d314ce98a051cd24d6e9636 memcached-3.2.0.tgz +sha256 c163434eb0da97c8f45c7ad41d979d381f8b81c49402b1b90b063987fb37972e memcached-3.4.0.tgz sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0 LICENSE sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054 fastlz/LICENSE sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82 g_fmt.h diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk index f92a8ddf4c..e45390e5a2 100644 --- a/package/php-memcached/php-memcached.mk +++ b/package/php-memcached/php-memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_MEMCACHED_VERSION = 3.2.0 +PHP_MEMCACHED_VERSION = 3.4.0 PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz PHP_MEMCACHED_SITE = https://pecl.php.net/get PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php/Config.ext b/package/php/Config.ext index 609cf17016..8cf4a7d160 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -139,6 +139,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI config BR2_PACKAGE_PHP_EXT_PGSQL bool "PostgreSQL" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -150,6 +151,7 @@ config BR2_PACKAGE_PHP_EXT_PGSQL comment "PostgreSQL extension needs a toolchain w/ dynamic library, wchar" depends on BR2_USE_MMU + depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "PostgreSQL extension can't be built with Optimize for fast" diff --git a/package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch b/package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch deleted file mode 100644 index 327933e26d..0000000000 --- a/package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5feed6d2f86750bfe1e7c26d6fd4e8d2195ea81f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 4 Aug 2022 19:54:23 +0200 -Subject: [PATCH] src/common/transport.cc: fallback value for RUSAGE_THREAD - -uClibc-ng currently does not define RUSAGE_THREAD, so let's add a -fallback value until it gets fixed in uClibc-ng. The value is the same -on all Linux systems, regardless of the CPU architecture. - -Signed-off-by: Thomas Petazzoni -Upstream bug: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MEXOUSFSH46UFS3AEMEIEPTL5U4HVEFL/ ---- - src/common/transport.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/common/transport.cc b/src/common/transport.cc -index 62efb8c..0f3abb0 100644 ---- a/src/common/transport.cc -+++ b/src/common/transport.cc -@@ -515,6 +515,10 @@ namespace Pistache::Tcp - - rusage now; - -+#if !defined(RUSAGE_THREAD) -+#define RUSAGE_THREAD 1 -+#endif -+ - auto res = getrusage(RUSAGE_THREAD, &now); - if (res == -1) - loadRequest_.reject(std::runtime_error("Could not compute usage")); --- -2.37.1 - diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch deleted file mode 100644 index f2fe2183ae..0000000000 --- a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 25 Feb 2023 18:09:39 +0100 -Subject: [PATCH] src/server/listener.cc: fix libressl build - -Fix the following libressl build failure: - -../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': -../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? - 582 | (SSL_verify_cb)cb - | ^~~~~~~~~~~~~ - | RSA_verify - -Fixes: - - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/1124] ---- - src/server/listener.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server/listener.cc b/src/server/listener.cc -index 38d2661..c09cb36 100644 ---- a/src/server/listener.cc -+++ b/src/server/listener.cc -@@ -609,7 +609,7 @@ namespace Pistache::Tcp - SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), - SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, - /* Callback type did change in 1.0.1 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - (int (*)(int, X509_STORE_CTX*))cb - #else - (SSL_verify_cb)cb --- -2.39.1 - diff --git a/package/pistache/0003-Add-missing-cstdint-header-include-1142.patch b/package/pistache/0003-Add-missing-cstdint-header-include-1142.patch deleted file mode 100644 index 3451e4aa4c..0000000000 --- a/package/pistache/0003-Add-missing-cstdint-header-include-1142.patch +++ /dev/null @@ -1,23 +0,0 @@ -From dabe9fcd3eaaa6b0b8723369b2565778341630c0 Mon Sep 17 00:00:00 2001 -From: a-andre <13609565+a-andre@users.noreply.github.com> -Date: Thu, 29 Jun 2023 16:34:11 +0200 -Subject: [PATCH] Add missing cstdint header include (#1142) - -Upstream: https://github.com/pistacheio/pistache/commit/dabe9fcd3eaaa6b0b8723369b2565778341630c0 -Signed-off-by: Fabrice Fontaine ---- - include/pistache/flags.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/flags.h b/include/pistache/flags.h -index 9be2b32bb..6adcc74bc 100644 ---- a/include/pistache/flags.h -+++ b/include/pistache/flags.h -@@ -13,6 +13,7 @@ - #pragma once - - #include -+#include - #include - #include - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index e66c24d86d..a026275f92 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -4,13 +4,12 @@ config BR2_PACKAGE_PISTACHE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. - https://github.com/oktal/pistache + https://github.com/pistacheio/pistache comment "pistache needs a toolchain w/ C++, gcc >= 7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 9a2cd1d1f9..545a556a24 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz +sha256 29af6562547497acf6f49170661786fe8cf1ed3712ad80e69c53da4661c59544 pistache-0.4.26.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index f4de5e3b2a..5afbcabaf3 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,18 +4,23 @@ # ################################################################################ -PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 -PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) +PISTACHE_VERSION = 0.4.26 +PISTACHE_SITE = $(call github,pistacheio,pistache,v$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE PISTACHE_INSTALL_STAGING = YES -PISTACHE_DEPENDENCIES = rapidjson + +ifeq ($(BR2_PACKAGE_RAPIDJSON),y) +PISTACHE_DEPENDENCIES += rapidjson +PISTACHE_CONF_OPTS += -DPISTACHE_USE_RAPIDJSON=true +else +PISTACHE_CONF_OPTS += -DPISTACHE_USE_RAPIDJSON=false +endif ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true -PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif diff --git a/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch b/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch deleted file mode 100644 index ad1a0902e2..0000000000 --- a/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d0045f1fc32635d9629ea9e361631b07d9ca4140 Mon Sep 17 00:00:00 2001 -From: Charlie Jenkins -Date: Mon, 21 Apr 2025 13:08:50 -0700 -Subject: [PATCH] RISC-V: Only enable RVV on linux if hwcap headers are - available - -Linux 6.4 introduced COMPAT_HWCAP_ISA_V. When trying to compile pixman -against linux headers older than this, pixman will fail to compile -because it assumes COMPAT_HWCAP_ISA_V exists. - -During meson configuration, do not enable have_rvv if the platform is -Linux and COMPAT_HWCAP_ISA_V doesn't exist. - -Signed-off-by: Charlie Jenkins -Fixes: 0e424031bda2 ("RISC-V floating point operations") -Upstream: https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/149 ---- - meson.build | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index fdea28f..cb10931 100644 ---- a/meson.build -+++ b/meson.build -@@ -379,7 +379,15 @@ if not use_rvv.disabled() - } - ''', - args : rvv_flags, -- name : 'RISC-V Vector Intrinsic Support') -+ name : 'RISC-V Vector Intrinsic Support') and cc.compiles(''' -+ #if defined(__linux__) -+ #include -+ #include -+ COMPAT_HWCAP_ISA_V -+ #endif -+ ''', -+ args : rvv_flags, -+ name: 'RISC-V Vector Linux HWCAP Support') - have_rvv = true - endif - endif --- -2.43.0 - diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index c49b9c9e76..bd386d3458 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,5 +1,5 @@ -# From https://lists.cairographics.org/archives/cairo/2024-December/029586.html -sha512 b24907f9a0bf6a9aa3278d31986c562c5f2d68f8c178021497c8648aca9f91e4c6f1ecfacf93eb01ba4f03ce4cfc5970fc40bb0fe6724bac9210fc57da09cba4 pixman-0.44.2.tar.xz +# From https://lists.freedesktop.org/archives/pixman/2025-July/005028.html +sha512 83b133e7969ba34f883f4e08dcc5d388c4397f43ce836c191c05945fe77c16ff501d531600780c12678a0d08105828a6bdeff2156b63f9c1a84087bc7f40ae9f pixman-0.46.4.tar.xz # Locally computed sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 76e72d6d96..1b66b41719 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.44.2 +PIXMAN_VERSION = 0.46.4 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT diff --git a/package/poco/Config.in b/package/poco/Config.in index fa23e6aa59..4801b36a24 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_POCO_DATA_MYSQL config BR2_PACKAGE_POCO_DATA_PGSQL bool "Data/PostgreSQL" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index 06e8646119..ebf310a6a1 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_POSTGRESQL bool "postgresql" depends on BR2_USE_MMU # fork() + depends on !BR2_sparc # atomic.h depends on BR2_USE_WCHAR depends on BR2_ENABLE_LOCALE # locale_t depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL @@ -36,6 +37,7 @@ endif comment "postgresql needs a toolchain w/ dynamic library, wchar, locale" depends on BR2_USE_MMU + depends on !BR2_sparc depends on !BR2_USE_WCHAR depends on !BR2_ENABLE_LOCALE depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index efa1b5e751..524066c61e 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v17.7/postgresql-17.7.tar.bz2.sha256 -sha256 ef9e343302eccd33112f1b2f0247be493cb5768313adeb558b02de8797a2e9b5 postgresql-17.7.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v18.1/postgresql-18.1.tar.bz2.sha256 +sha256 ff86675c336c46e98ac991ebb306d1b67621ece1d06787beaade312c2c915d54 postgresql-18.1.tar.bz2 # License file, Locally calculated sha256 5ed3ce5c9373dff7f98b1fae7a6c7ccd98df7d734d46d24c1bcebf1240be8307 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 86761bf939..78d7cef4f6 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 17.7 +POSTGRESQL_VERSION = 18.1 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -38,12 +38,6 @@ POSTGRESQL_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-world POSTGRESQL_INSTALL_STAGING_OPTS += DESTDIR=$(STAGING_DIR) install-world endif -ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_riscv)$(BR2_xtensa),y) -POSTGRESQL_CONF_OPTS += -Dspinlocks=false -else -POSTGRESQL_CONF_OPTS += -Dspinlocks=true -endif - ifeq ($(BR2_PACKAGE_READLINE),y) POSTGRESQL_DEPENDENCIES += readline POSTGRESQL_CONF_OPTS += -Dreadline=enabled diff --git a/package/proj/proj.hash b/package/proj/proj.hash index 5249f52c10..4ac7b444f4 100644 --- a/package/proj/proj.hash +++ b/package/proj/proj.hash @@ -1,5 +1,5 @@ # Fetched from https://download.osgeo.org/proj/proj-9.5.1.tar.gz.md5 md5 07c44ca4a65a0664ce823c8448707c78 proj-9.5.1.tar.gz # Locally calculated -sha256 a8395f9696338ffd46b0feb603edbb730fad6746fba77753c77f7f997345e3d3 proj-9.5.1.tar.gz +sha256 65705ecd987b50bf63e15820ce6bd17c042feaabda981249831bd230f6689709 proj-9.7.0.tar.gz sha256 6a8f30793e877d32e3f88b972f0970a051a3b5a26cd057d3993cb51e21c43319 COPYING diff --git a/package/proj/proj.mk b/package/proj/proj.mk index 361c1e50b1..4840824f69 100644 --- a/package/proj/proj.mk +++ b/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 9.5.1 +PROJ_VERSION = 9.7.0 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING diff --git a/package/psimd/Config.in b/package/psimd/Config.in index c5c51ca2ef..32ce17d858 100644 --- a/package/psimd/Config.in +++ b/package/psimd/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PSIMD help Portable 128-bit SIMD intrinsics. - https://github.com/Maratyszcza/psimd + https://github.com/snest/psimd diff --git a/package/psimd/psimd.hash b/package/psimd/psimd.hash index 5692e79bd6..69481438e4 100644 --- a/package/psimd/psimd.hash +++ b/package/psimd/psimd.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f6c4dab91ae9a03b3019e7cab0572743afd0e1b6e75b97fcca50259c737c924e psimd-072586a71b55b7f8c584153d223e95687148a900.tar.gz +sha256 8934a8dff062663331a17588dfb771940be9d22887596c8ca77e25026c2adc6f psimd-4674816f56757dbd99b297cb5647f2520df08db1.tar.gz # License files, locally calculated sha256 984ce1e0b8ee89d234e28b960381f240e03a07a8031f35012f9c3256f56964e2 LICENSE diff --git a/package/psimd/psimd.mk b/package/psimd/psimd.mk index be0090a32f..cf6562a3f4 100644 --- a/package/psimd/psimd.mk +++ b/package/psimd/psimd.mk @@ -4,8 +4,8 @@ # ################################################################################ -PSIMD_VERSION = 072586a71b55b7f8c584153d223e95687148a900 -PSIMD_SITE = $(call github,Maratyszcza,psimd,$(PSIMD_VERSION)) +PSIMD_VERSION = 4674816f56757dbd99b297cb5647f2520df08db1 +PSIMD_SITE = $(call github,snest,psimd,$(PSIMD_VERSION)) PSIMD_LICENSE = MIT PSIMD_LICENSE_FILES = LICENSE PSIMD_INSTALL_STAGING = YES diff --git a/package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch b/package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch new file mode 100644 index 0000000000..2233887ab5 --- /dev/null +++ b/package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch @@ -0,0 +1,38 @@ +From c0676b3493fda29d97c271cfeb76267019b35695 Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Thu, 15 May 2025 16:38:53 +0200 +Subject: [PATCH] CMakeLists.txt: Update version range from 2.8 to 3.31.5 to + avoid abort + +The error with CMake 4 on the github CI looks like this: + +CMake Error at CMakeLists.txt:22 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Upstream: http://sigrok.org/gitweb/?p=pulseview.git;a=commit;h=c0676b3493fda29d97c271cfeb76267019b35695 + +Signed-off-by: Bernd Kuhls +[backported to 0.4.2] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec86073d..8580fa8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ + ## along with this program. If not, see . + ## + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 2.8.12...3.31.5) + + include(GNUInstallDirs) + diff --git a/package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch b/package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch new file mode 100644 index 0000000000..8c7518dd6e --- /dev/null +++ b/package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch @@ -0,0 +1,26 @@ +From e2fe9dfb91c7de85c410922ee9268c3f526bcc54 Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Thu, 15 May 2025 18:19:24 +0200 +Subject: [PATCH] CMakeLists.txt: Fix the version for the manual, too + +Upstream: https://github.com/sigrokproject/pulseview/commit/e2fe9dfb91c7de85c410922ee9268c3f526bcc54 + +Signed-off-by: Bernd Kuhls +[backported to 0.4.2] +--- + manual/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt +index 3b881a56..d6c54d61 100644 +--- a/manual/CMakeLists.txt ++++ b/manual/CMakeLists.txt +@@ -17,7 +17,7 @@ + ## along with this program. If not, see . + ## + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 2.8.12...3.31.5) + + # External dependencies, required and optional tools. + find_program(ASCIIDOCTOR_EXECUTABLE NAMES asciidoctor) diff --git a/package/python-annotated-doc/Config.in b/package/python-annotated-doc/Config.in new file mode 100644 index 0000000000..3bd240f211 --- /dev/null +++ b/package/python-annotated-doc/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ANNOTATED_DOC + bool "python-annotated-doc" + help + Document parameters, class attributes, return types, and + variables inline, with Annotated. + + https://github.com/fastapi/annotated-doc diff --git a/package/python-annotated-doc/python-annotated-doc.hash b/package/python-annotated-doc/python-annotated-doc.hash new file mode 100644 index 0000000000..8ffdae9b5d --- /dev/null +++ b/package/python-annotated-doc/python-annotated-doc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/annotated-doc/json +md5 825f2ecff1f182cd942ea09907ebafdb annotated_doc-0.0.4.tar.gz +sha256 fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4 annotated_doc-0.0.4.tar.gz +# Locally computed sha256 checksums +sha256 fff170779a6acbf65abdb405c087f1cee1786691e4a96a4034517e4a504a0cdf LICENSE diff --git a/package/python-annotated-doc/python-annotated-doc.mk b/package/python-annotated-doc/python-annotated-doc.mk new file mode 100644 index 0000000000..2186601a8c --- /dev/null +++ b/package/python-annotated-doc/python-annotated-doc.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-annotated-doc +# +################################################################################ + +PYTHON_ANNOTATED_DOC_VERSION = 0.0.4 +PYTHON_ANNOTATED_DOC_SOURCE = annotated_doc-$(PYTHON_ANNOTATED_DOC_VERSION).tar.gz +PYTHON_ANNOTATED_DOC_SITE = https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c +PYTHON_ANNOTATED_DOC_SETUP_TYPE = pep517 +PYTHON_ANNOTATED_DOC_LICENSE = MIT +PYTHON_ANNOTATED_DOC_LICENSE_FILES = LICENSE +PYTHON_ANNOTATED_DOC_DEPENDENCIES = host-python-pdm-backend + +$(eval $(python-package)) diff --git a/package/python-apscheduler/python-apscheduler.hash b/package/python-apscheduler/python-apscheduler.hash index 1f2ba1f82e..55026aec7b 100644 --- a/package/python-apscheduler/python-apscheduler.hash +++ b/package/python-apscheduler/python-apscheduler.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/apscheduler/json -md5 1705663d09aeb1b174f964780c57520a apscheduler-3.11.0.tar.gz -sha256 4c622d250b0955a65d5d0eb91c33e6d43fd879834bf541e0a18661ae60460133 apscheduler-3.11.0.tar.gz +md5 ff8d1731e31d88e2e1fd0794099c920f apscheduler-3.11.1.tar.gz +sha256 0db77af6400c84d1747fe98a04b8b58f0080c77d11d338c4f507a9752880f221 apscheduler-3.11.1.tar.gz # Locally computed sha256 checksums sha256 6163f7987dfb38d6bc320ce2b70b2f02b862bc41126516d552ef1cd43247e758 LICENSE.txt diff --git a/package/python-apscheduler/python-apscheduler.mk b/package/python-apscheduler/python-apscheduler.mk index c5d89c5c2d..b03022149f 100644 --- a/package/python-apscheduler/python-apscheduler.mk +++ b/package/python-apscheduler/python-apscheduler.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_APSCHEDULER_VERSION = 3.11.0 +PYTHON_APSCHEDULER_VERSION = 3.11.1 PYTHON_APSCHEDULER_SOURCE = apscheduler-$(PYTHON_APSCHEDULER_VERSION).tar.gz -PYTHON_APSCHEDULER_SITE = https://files.pythonhosted.org/packages/4e/00/6d6814ddc19be2df62c8c898c4df6b5b1914f3bd024b780028caa392d186 +PYTHON_APSCHEDULER_SITE = https://files.pythonhosted.org/packages/d0/81/192db4f8471de5bc1f0d098783decffb1e6e69c4f8b4bc6711094691950b PYTHON_APSCHEDULER_SETUP_TYPE = setuptools PYTHON_APSCHEDULER_DEPENDENCIES = host-python-setuptools-scm PYTHON_APSCHEDULER_LICENSE = MIT diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index 4605835abb..89495e0257 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 6799fce19314e0aaeb789a6d0f6d45fa asgiref-3.10.0.tar.gz -sha256 d89f2d8cd8b56dada7d52fa7dc8075baa08fb836560710d38c292a7a3f78c04e asgiref-3.10.0.tar.gz +md5 554794453502d266a90d2254fcb1f7c3 asgiref-3.11.0.tar.gz +sha256 13acff32519542a1736223fb79a715acdebe24286d98e8b164a73085f40da2c4 asgiref-3.11.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index 3bd9c8f937..e5885a66c6 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.10.0 +PYTHON_ASGIREF_VERSION = 3.11.0 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/46/08/4dfec9b90758a59acc6be32ac82e98d1fbfc321cb5cfa410436dbacf821c +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/76/b9/4db2509eabd14b4a8c71d1b24c8d5734c52b8560a7b1e1a8b56c8d25568b PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index ef0e0d4ca5..cc80fa1bbe 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 7fe97b2e79933430062935f3759a09b0 certifi-2025.10.5.tar.gz -sha256 47c09d31ccf2acf0be3f701ea53595ee7e0b8fa08801c6624be771df09ae7b43 certifi-2025.10.5.tar.gz +md5 430a5fa9f18895a9b69a018d2beae67b certifi-2025.11.12.tar.gz +sha256 d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316 certifi-2025.11.12.tar.gz # Locally computed sha256 checksums sha256 e93716da6b9c0d5a4a1df60fe695b370f0695603d21f6f83f053e42cfc10caf7 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index ad85d44bbc..1f889d425d 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2025.10.5 +PYTHON_CERTIFI_VERSION = 2025.11.12 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/4c/5b/b6ce21586237c77ce67d01dc5507039d444b630dd76611bbca2d8e5dcd91 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/a2/8c/58f469717fa48465e4a50c014a0400602d3c437d7c0c468e17ada824da3a PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE diff --git a/package/python-click/python-click.hash b/package/python-click/python-click.hash index df8528a786..84eafea3b7 100644 --- a/package/python-click/python-click.hash +++ b/package/python-click/python-click.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/click/json -md5 fa228744ff03a339957e847fb7890823 click-8.3.0.tar.gz -sha256 e7b8232224eba16f4ebe410c25ced9f7875cb5f3263ffc93cc3e8da705e229c4 click-8.3.0.tar.gz +md5 5f89d725a424b101607ec40927f78773 click-8.3.1.tar.gz +sha256 12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a click-8.3.1.tar.gz # Locally computed sha256 checksums sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.txt diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index ef22c27439..8a4f99e9a1 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CLICK_VERSION = 8.3.0 +PYTHON_CLICK_VERSION = 8.3.1 PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/46/61/de6cd827efad202d7057d93e0fed9294b96952e188f7384832791c7b2254 +PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/3d/fa/656b739db8587d7b5dfa22e22ed02566950fbfbcdc20311993483657a5c0 PYTHON_CLICK_SETUP_TYPE = flit PYTHON_CLICK_LICENSE = BSD-3-Clause PYTHON_CLICK_LICENSE_FILES = LICENSE.txt diff --git a/package/python-dotenv/python-dotenv.hash b/package/python-dotenv/python-dotenv.hash index 5b4be41206..53ab12e11c 100644 --- a/package/python-dotenv/python-dotenv.hash +++ b/package/python-dotenv/python-dotenv.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dotenv/json -md5 b3e9652d1974f8c7574c43f719799f3a python_dotenv-1.1.1.tar.gz -sha256 a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab python_dotenv-1.1.1.tar.gz +md5 72b43685c14b492ced7ed6fb1e3f1d63 python_dotenv-1.2.1.tar.gz +sha256 42667e897e16ab0d66954af0e60a9caa94f0fd4ecf3aaf6d2d260eec1aa36ad6 python_dotenv-1.2.1.tar.gz # Locally computed sha256 checksums sha256 80619b7049f08c81683ad0e01f08f257a840652dd71ee83146d36658c7d2c2b9 LICENSE diff --git a/package/python-dotenv/python-dotenv.mk b/package/python-dotenv/python-dotenv.mk index 8f11c5de8d..6ebc4f6c8c 100644 --- a/package/python-dotenv/python-dotenv.mk +++ b/package/python-dotenv/python-dotenv.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOTENV_VERSION = 1.1.1 +PYTHON_DOTENV_VERSION = 1.2.1 PYTHON_DOTENV_SOURCE = python_dotenv-$(PYTHON_DOTENV_VERSION).tar.gz -PYTHON_DOTENV_SITE = https://files.pythonhosted.org/packages/f6/b0/4bc07ccd3572a2f9df7e6782f52b0c6c90dcbb803ac4a167702d7d0dfe1e +PYTHON_DOTENV_SITE = https://files.pythonhosted.org/packages/f0/26/19cadc79a718c5edbec86fd4919a6b6d3f681039a2f6d66d14be94e75fb9 PYTHON_DOTENV_SETUP_TYPE = setuptools PYTHON_DOTENV_LICENSE = BSD-3-Clause PYTHON_DOTENV_LICENSE_FILES = LICENSE diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in index 21997daf9a..0dd4499a3f 100644 --- a/package/python-fastapi/Config.in +++ b/package/python-fastapi/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_FASTAPI bool "python-fastapi" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_ANNOTATED_DOC # runtime select BR2_PACKAGE_PYTHON_PYDANTIC # runtime select BR2_PACKAGE_PYTHON_STARLETTE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 34bfe22c87..7ef8628579 100644 --- a/package/python-fastapi/python-fastapi.hash +++ b/package/python-fastapi/python-fastapi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastapi/json -md5 5d539db8065d3579430ed00577e8a86b fastapi-0.119.1.tar.gz -sha256 a5e3426edce3fe221af4e1992c6d79011b247e3b03cc57999d697fe76cbf8ae0 fastapi-0.119.1.tar.gz +md5 b72bd92dd17ba585f8fc3cf37f95c6f2 fastapi-0.123.9.tar.gz +sha256 ab33d672d8e1cc6e0b49777eb73c32ccf20761011f5ca16755889ab406fd1de0 fastapi-0.123.9.tar.gz # Locally computed sha256 checksums sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index 4a067494a7..207dc88d8f 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.119.1 +PYTHON_FASTAPI_VERSION = 0.123.9 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/a6/f4/152127681182e6413e7a89684c434e19e7414ed7ac0c632999c3c6980640 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/2c/01/c3fb48c0135d89586a03c3e2c5bc04540dda52079a1af5cac4a63598efb9 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE diff --git a/package/python-gpiod/Config.in b/package/python-gpiod/Config.in new file mode 100644 index 0000000000..8f67178ae7 --- /dev/null +++ b/package/python-gpiod/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_GPIOD + bool "python-gpiod" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 # libgpiod2 + depends on !BR2_PACKAGE_LIBGPIOD # libgpiod2 + select BR2_PACKAGE_LIBGPIOD2 + help + Python bindings for libgpiod (v2+). + + https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/tree/bindings/python/ + +comment "python-gpiod needs kernel headers >= 5.10" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +comment "python-gpiod is incompatible with libgpiod" + depends on BR2_PACKAGE_LIBGPIOD diff --git a/package/python-gpiod/python-gpiod.hash b/package/python-gpiod/python-gpiod.hash new file mode 100644 index 0000000000..bbcc7181ff --- /dev/null +++ b/package/python-gpiod/python-gpiod.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/gpiod/json +md5 62cf044aa3214d0ebee6aef78db2aa52 gpiod-2.4.0.tar.g +sha256 9243a1a59d084ec749d1df4a1e2f238ffb9d94515b0d9f5335460175143c3aa1 gpiod-2.4.0.tar.gz +# Locally computed +sha256 a2b24e2158144b22a77a6a404fc5a05911612c5b99d7ab6d0e2addcaeb7514a3 pyproject.toml diff --git a/package/python-gpiod/python-gpiod.mk b/package/python-gpiod/python-gpiod.mk new file mode 100644 index 0000000000..8ab901972e --- /dev/null +++ b/package/python-gpiod/python-gpiod.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-gpiod +# +################################################################################ + +PYTHON_GPIOD_VERSION = 2.4.0 +PYTHON_GPIOD_SOURCE = gpiod-$(PYTHON_GPIOD_VERSION).tar.gz +PYTHON_GPIOD_SITE = https://files.pythonhosted.org/packages/0c/dc/5a6bd309345bd9cfa7e098174ab7e65367e408539b6c1998e4f267c673cd +PYTHON_GPIOD_SETUP_TYPE = setuptools +PYTHON_GPIOD_LICENSE = LGPL-2.1+ +# The package license follows libgpiod's license but doesn't include the LICENSE text in the pypi distrobuted package again +PYTHON_GPIOD_LICENSE_FILES = pyproject.toml +PYTHON_GPIOD_DEPENDENCIES = libgpiod2 +PYTHON_GPIOD_ENV = LINK_SYSTEM_LIBGPIOD=1 + +$(eval $(python-package)) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index fbf571f806..188f290f41 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 28448b00665099117b6daa9887812cc4 idna-3.10.tar.gz -sha256 12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 idna-3.10.tar.gz +md5 9a9c33db960e0d35cc5b257c37dabeff idna-3.11.tar.gz +sha256 795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902 idna-3.11.tar.gz # Locally computed sha256 checksums -sha256 a59f0b0ef3635874109a4461ca44ff7a70d50696e814767bfaf721d4c9b0db0f LICENSE.md +sha256 b7a336abf3b04e180ec065cdd16e705d079e1cc7a14f910aa6e9187f36b9cd87 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index c7b7f6ad00..2b654a480c 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.10 +PYTHON_IDNA_VERSION = 3.11 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = flit diff --git a/package/python-immutabledict/python-immutabledict.hash b/package/python-immutabledict/python-immutabledict.hash index 1dd4a79597..f917e43702 100644 --- a/package/python-immutabledict/python-immutabledict.hash +++ b/package/python-immutabledict/python-immutabledict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/immutabledict/json -md5 ac3ce87a7507d3e7d44a24a6b6bdb4a7 immutabledict-4.2.1.tar.gz -sha256 d91017248981c72eb66c8ff9834e99c2f53562346f23e7f51e7a5ebcf66a3bcc immutabledict-4.2.1.tar.gz +md5 2ddeb671f200618365b11b997d50368f immutabledict-4.2.2.tar.gz +sha256 cb6ed3090df593148f94cb407d218ca526fd2639694afdb553dc4f50ce6feeca immutabledict-4.2.2.tar.gz # Locally computed sha256 checksums sha256 347f918d37d4e0556a0695d34b9fb87fa9bbe808d54949851789c6c1fc91c61f LICENSE diff --git a/package/python-immutabledict/python-immutabledict.mk b/package/python-immutabledict/python-immutabledict.mk index 902352a5d0..4a886b1607 100644 --- a/package/python-immutabledict/python-immutabledict.mk +++ b/package/python-immutabledict/python-immutabledict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IMMUTABLEDICT_VERSION = 4.2.1 +PYTHON_IMMUTABLEDICT_VERSION = 4.2.2 PYTHON_IMMUTABLEDICT_SOURCE = immutabledict-$(PYTHON_IMMUTABLEDICT_VERSION).tar.gz -PYTHON_IMMUTABLEDICT_SITE = https://files.pythonhosted.org/packages/e0/c5/4240186fbabc58fba41bbe17c5f0cd37ffd4c0b85a5029ab104f946df175 +PYTHON_IMMUTABLEDICT_SITE = https://files.pythonhosted.org/packages/ce/12/1da8e1a9050d0603ba65fb1796ed8860a705b906701c96e77f85cc7490be PYTHON_IMMUTABLEDICT_SETUP_TYPE = poetry PYTHON_IMMUTABLEDICT_LICENSE = MIT PYTHON_IMMUTABLEDICT_LICENSE_FILES = LICENSE diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 6cc5bb14c6..d17cd026b1 100644 --- a/package/python-msgpack/python-msgpack.hash +++ b/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 abcd18fded80a89c486c0446f112eb06 msgpack-1.1.1.tar.gz -sha256 77b79ce34a2bdab2594f490c8e80dd62a02d650b91a75159a63ec413b8d104cd msgpack-1.1.1.tar.gz +md5 b69973fa3325abdced4051f5ef3847d3 msgpack-1.1.2.tar.gz +sha256 3b60763c1373dd60f398488069bcdc703cd08a711477b5d480eecc9f9626f47e msgpack-1.1.2.tar.gz # Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index d61e0963a1..76606268ae 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.1.1 +PYTHON_MSGPACK_VERSION = 1.1.2 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/45/b1/ea4f68038a18c77c9467400d166d74c4ffa536f34761f7983a104357e614 +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/4d/f2/bfb55a6236ed8725a96b0aa3acbd0ec17588e6a2c3b62a93eb513ed8783f PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in index 8eeeb42692..24eaea6d9c 100644 --- a/package/python-psycopg2/Config.in +++ b/package/python-psycopg2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 bool "python-psycopg2" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -29,6 +30,7 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 comment "python-psycopg2 needs a toolchain w/ dynamic library, wchar" depends on BR2_USE_MMU + depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "python-psycopg2 can't be built with Optimize for fast" diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index f61ab7a8e4..6ab537ad67 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 8c31786f387bc0ce4a0fdfb500dbee7b102358616633b37159b389d5c53efa64 python-pydantic-core-2.41.4-cargo4.tar.gz +sha256 8919dc76250449ed22d47e94f53929cb44eb982cd4ad80dc0607f8018868e549 python-pydantic-core-2.41.5-cargo4.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 9eb0510278..7394e947ec 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -6,10 +6,10 @@ # python-pydantic pins an exact version of pydantic-core in pyproject.toml, # make sure to sync pydantic-core to this version when updating pydantic -PYTHON_PYDANTIC_CORE_VERSION = 2.41.4 +PYTHON_PYDANTIC_CORE_VERSION = 2.41.5 PYTHON_PYDANTIC_CORE_SOURCE_PYPI = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz PYTHON_PYDANTIC_CORE_SITE = $(PYTHON_PYDANTIC_CORE_SITE_PYPI)/$(PYTHON_PYDANTIC_CORE_SOURCE_PYPI)?buildroot-path=filename -PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/df/18/d0944e8eaaa3efd0a91b0f1fc537d3be55ad35091b6a87638211ba691964 +PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/71/70/23b021c950c2addd24ec408e9ab05d59b035b39d97cdc1130e1bce647bb6 PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE diff --git a/package/python-pydantic-settings/python-pydantic-settings.hash b/package/python-pydantic-settings/python-pydantic-settings.hash index 3d0f053968..90a1260219 100644 --- a/package/python-pydantic-settings/python-pydantic-settings.hash +++ b/package/python-pydantic-settings/python-pydantic-settings.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic-settings/json -md5 bfd7d2cc366483b19181428756e6a58a pydantic_settings-2.11.0.tar.gz -sha256 d0e87a1c7d33593beb7194adb8470fc426e95ba02af83a0f23474a04c9a08180 pydantic_settings-2.11.0.tar.gz +md5 597adf8b487b9297eda123b211666e98 pydantic_settings-2.12.0.tar.gz +sha256 005538ef951e3c2a68e1c08b292b5f2e71490def8589d4221b95dab00dafcfd0 pydantic_settings-2.12.0.tar.gz # Locally computed sha256 checksums sha256 eb355a753e020346d33d83bf9769135b89fc610568ac531a01c295bcee7fd998 LICENSE diff --git a/package/python-pydantic-settings/python-pydantic-settings.mk b/package/python-pydantic-settings/python-pydantic-settings.mk index ab5205b7e1..a7c50b8027 100644 --- a/package/python-pydantic-settings/python-pydantic-settings.mk +++ b/package/python-pydantic-settings/python-pydantic-settings.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_SETTINGS_VERSION = 2.11.0 +PYTHON_PYDANTIC_SETTINGS_VERSION = 2.12.0 PYTHON_PYDANTIC_SETTINGS_SOURCE = pydantic_settings-$(PYTHON_PYDANTIC_SETTINGS_VERSION).tar.gz -PYTHON_PYDANTIC_SETTINGS_SITE = https://files.pythonhosted.org/packages/20/c5/dbbc27b814c71676593d1c3f718e6cd7d4f00652cefa24b75f7aa3efb25e +PYTHON_PYDANTIC_SETTINGS_SITE = https://files.pythonhosted.org/packages/43/4b/ac7e0aae12027748076d72a8764ff1c9d82ca75a7a52622e67ed3f765c54 PYTHON_PYDANTIC_SETTINGS_SETUP_TYPE = hatch PYTHON_PYDANTIC_SETTINGS_LICENSE = MIT PYTHON_PYDANTIC_SETTINGS_LICENSE_FILES = LICENSE diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 12604059d6..587007361b 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 d01464f3a5256144116a8de55e2974b8 pydantic-2.12.3.tar.g -sha256 1da1c82b0fc140bb0103bc1441ffe062154c8d38491189751ee00fd8ca65ce74 pydantic-2.12.3.tar.gz +md5 ae668857700cf7db44db2d3492aadf56 pydantic-2.12.4.tar.gz +sha256 0f8cb9555000a4b5b617f66bfd2566264c4984b27589d3b845685983e8ea85ac pydantic-2.12.4.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b0cb1f1ce0..99845f8bce 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.12.3 +PYTHON_PYDANTIC_VERSION = 2.12.4 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/f3/1e/4f0a3233767010308f2fd6bd0814597e3f63f1dc98304a9112b8759df4ff +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/96/ad/a17bc283d7d81837c061c49e3eaa27a45991759a1b7eae1031921c6bd924 PYTHON_PYDANTIC_SETUP_TYPE = hatch PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index afd14437ce..81cdd4f459 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyicu/json -md5 6ae2145f2a98433f461b128c3ebef233 pyicu-2.15.3.tar.gz -sha256 f32e78e1cb64d0aeb14f027e037a8944861d3114548818a6adf0081ef51aefc3 pyicu-2.15.3.tar.gz +md5 00715b86c27c150f48554a863688e878 pyicu-2.16.tar.gz +sha256 42b3a8062e3b23e927ca727e6b5e1730d86c70279834e4887152895d2eb012d9 pyicu-2.16.tar.gz # Locally computed sha256 checksums sha256 00da5bf22f2386c4f6f07c734490e9b818c4dcf70e6ca49f594e9cec636b9c40 LICENSE diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 5025bd649b..9d3f5f6004 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 2.15.3 +PYTHON_PYICU_VERSION = 2.16 PYTHON_PYICU_SOURCE = pyicu-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/88/b0/c8b61bac55424e2ff80e20d7251c3f002baff3c07c34cee3849e3505d8f5 +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/11/c3/8d558b30deb33eb583c0bcae3e64d6db8316b69461a04bb9db5ff63d3f6e PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu diff --git a/package/python-wrapt/python-wrapt.hash b/package/python-wrapt/python-wrapt.hash index 69a464ff49..3fc809d9c0 100644 --- a/package/python-wrapt/python-wrapt.hash +++ b/package/python-wrapt/python-wrapt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wrapt/json -md5 bdc6d3460db4cdee3383dfe318b5c317 wrapt-2.0.0.tar.gz -sha256 35a542cc7a962331d0279735c30995b024e852cf40481e384fd63caaa391cbb9 wrapt-2.0.0.tar.gz +md5 43c737f84345bc317bbb028d9de1b4e4 wrapt-2.0.1.tar.gz +sha256 9c9c635e78497cacb81e84f8b11b23e0aacac7a136e73b8e5b2109a1d9fc468f wrapt-2.0.1.tar.gz # Locally computed sha256 checksums sha256 9abc41aa6b8690c07ede9b44b7c6233d014290ed1e3b5ccc37e292295b5d058f LICENSE diff --git a/package/python-wrapt/python-wrapt.mk b/package/python-wrapt/python-wrapt.mk index 8fff0cf3fa..86454371b2 100644 --- a/package/python-wrapt/python-wrapt.mk +++ b/package/python-wrapt/python-wrapt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WRAPT_VERSION = 2.0.0 +PYTHON_WRAPT_VERSION = 2.0.1 PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/49/19/5e5bcd855d808892fe02d49219f97a50f64cd6d8313d75df3494ee97b1a3 +PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/49/2a/6de8a50cb435b7f42c46126cf1a54b2aab81784e74c8595c8e025e8f36d3 PYTHON_WRAPT_SETUP_TYPE = setuptools PYTHON_WRAPT_LICENSE = BSD-2-Clause PYTHON_WRAPT_LICENSE_FILES = LICENSE diff --git a/package/qhull/0001-Cmake-improvements.patch b/package/qhull/0001-Cmake-improvements.patch new file mode 100644 index 0000000000..c75bb7932b --- /dev/null +++ b/package/qhull/0001-Cmake-improvements.patch @@ -0,0 +1,37 @@ +From 62ccc56af071eaa478bef6ed41fd7a55d3bb2d80 Mon Sep 17 00:00:00 2001 +From: Cristian Le +Date: Wed, 2 Jul 2025 15:07:37 +0200 +Subject: [PATCH] Cmake improvements (#158) + +* Bump CMake policies -- Add higher policy bound (it is not the maximum version of CMake that can build, it's an indication that the lower bound can be bumped up to that version without degradation) + +* Use GNUInstallDirs -- This has been the standard install interface since CMake 3.0 + +* Use more common design for the Config.cmake + +* Use `target_include_directories` -- Use target_include_directories to propagate the include directory. Note: I don't know how the user consumes the package as #include or #include , it is the latter in this implementation. + +[cbbarber] user_eg_r.c uses + #include "libqhull_r/qhull_ra.h" + +Upstream: https://github.com/qhull/qhull/commit/62ccc56af071eaa478bef6ed41fd7a55d3bb2d80 + +Signed-off-by: Bernd Kuhls +[removed other parts of the patch, kept cmake bump, rebased for 8.0.2] +--- + CMakeLists.txt | 105 ++++++++++++++++++++++++------------------ + 3 files changed, 63 insertions(+), 48 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2060f49..28714b15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,7 @@ + # $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $ + + project(qhull) +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5...4.0) + + # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt + # qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm diff --git a/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash index 439d8e3a8f..6ae08a3152 100644 --- a/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash +++ b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0837d5752a89ae7b9779cceac4aa758aad89688154a6a110a53fe16cbe6adca4 qoriq-ddr-phy-binary-lf-6.12.20-2.0.0.tar.gz +sha256 d5a5a9b7f25295e9e41c8e7c18a1986d1b59ebe519113ed6b45ede51639da92f qoriq-ddr-phy-binary-lf-6.12.34-2.1.0.tar.gz sha256 e7e5f4949f7ac9f9a5d4d68b8f835f3ddc93ad47b594a11de699d90b9175413f NXP-Binary-EULA.txt diff --git a/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk index 665b653d20..04cedbbe00 100644 --- a/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk +++ b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_DDR_PHY_BINARY_VERSION = lf-6.12.20-2.0.0 +QORIQ_DDR_PHY_BINARY_VERSION = lf-6.12.34-2.1.0 QORIQ_DDR_PHY_BINARY_SITE = $(call github,nxp-qoriq,ddr-phy-binary,$(QORIQ_DDR_PHY_BINARY_VERSION)) QORIQ_DDR_PHY_BINARY_LICENSE = NXP Binary EULA QORIQ_DDR_PHY_BINARY_LICENSE_FILES = NXP-Binary-EULA.txt diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash index fb5fdac9a6..1f6bd01b64 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12894dd52239e98b00bdd0a4e30b57d7bf6c37becf2a5db4a2e7d0074435d072 qoriq-fm-ucode-lf-6.12.20-2.0.0.tar.gz +sha256 a3ee2bd375c90de1249ff49e6185874583edd92aa2e2bfb4ccf25b7d8a563205 qoriq-fm-ucode-lf-6.12.34-2.1.0.tar.gz sha256 7a223031d76339df0e4e5a94d193a270fb9963d42b577aa42fe130a4657f3e17 LICENSE diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk index fe71c283ea..3c197346ca 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_FM_UCODE_VERSION = lf-6.12.20-2.0.0 +QORIQ_FM_UCODE_VERSION = lf-6.12.34-2.1.0 QORIQ_FM_UCODE_SITE = $(call github,nxp-qoriq,qoriq-fm-ucode,$(QORIQ_FM_UCODE_VERSION)) QORIQ_FM_UCODE_LICENSE = NXP Binary EULA QORIQ_FM_UCODE_LICENSE_FILES = LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index 1bdd38446d..99dd860e02 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cf1caf7f45989025f8564c5edd9c98650082ebb2d091239292d3db8d75522164 qoriq-rcw-lf-6.12.20-2.0.0.tar.gz +sha256 5106d0e42a990b5474100cbc397d27f550bb226420664ac5a40b952706b680cd qoriq-rcw-lf-6.12.34-2.1.0.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 35602e41e4..1394766b92 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_RCW_VERSION = lf-6.12.20-2.0.0 +QORIQ_RCW_VERSION = lf-6.12.34-2.1.0 QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index c45b8c1591..8f14540eb4 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -72,6 +72,7 @@ config BR2_PACKAGE_QT5BASE_MYSQL config BR2_PACKAGE_QT5BASE_PSQL bool "PostgreSQL Plugin" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -84,6 +85,7 @@ config BR2_PACKAGE_QT5BASE_PSQL comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library" depends on BR2_USE_MMU + depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "PostgreSQL plugin can't be built with Optimize for fast" diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 7f3948ec27..e6bb99de28 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -202,6 +202,7 @@ comment "MySQL plugin needs a toolchain w/ C++, threads" config BR2_PACKAGE_QT6BASE_PSQL bool "PostgreSQL Plugin" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql @@ -213,6 +214,7 @@ config BR2_PACKAGE_QT6BASE_PSQL comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library" depends on BR2_USE_MMU + depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "PostgreSQL plugin can't be built with optimize for fast" diff --git a/package/read-edid/0004-cmake4.patch b/package/read-edid/0004-cmake4.patch new file mode 100644 index 0000000000..4530a9d3b9 --- /dev/null +++ b/package/read-edid/0004-cmake4.patch @@ -0,0 +1,17 @@ +Fix build with newer CMake versions + +Downloaded from +https://gitlab.com/liguros/liguros-repo/-/blob/develop/x11-misc/read-edid/files/read-edid-3.0.2-cmake4.patch + +Upstream: sent to pyrophobicman@gmail.com + +Signed-off-by: Bernd Kuhls + +--- a/CMakeLists.txt 2014-02-05 17:27:26.000000000 +0100 ++++ b/CMakeLists.txt 2025-08-27 23:01:08.868613931 +0200 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.10) + project (read-edid C) + + option(I2CBUILD "Build I2C get-edid implementation" ON) diff --git a/package/rtl_433/0001-build-Update-for-compat-with-newer-CMake.patch b/package/rtl_433/0001-build-Update-for-compat-with-newer-CMake.patch new file mode 100644 index 0000000000..81cb5cd094 --- /dev/null +++ b/package/rtl_433/0001-build-Update-for-compat-with-newer-CMake.patch @@ -0,0 +1,25 @@ +From 42ac641452aa56afa04f7bad5a55f790ee639852 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Sun, 30 Mar 2025 12:05:53 +0200 +Subject: [PATCH] build: Update for compat with newer CMake (closes #3245) + +Upstream: https://github.com/merbanan/rtl_433/commit/42ac641452aa56afa04f7bad5a55f790ee639852 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08f63eea7..6dc1f7910 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + ######################################################################## + # Project setup + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.6...3.10) + # Fix behavior of CMAKE_C_STANDARD when targeting macOS. + if(POLICY CMP0025) + cmake_policy(SET CMP0025 NEW) diff --git a/package/sbc/sbc.hash b/package/sbc/sbc.hash index b080c06205..313551101a 100644 --- a/package/sbc/sbc.hash +++ b/package/sbc/sbc.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256 8f12368e1dbbf55e14536520473cfb338c84b392939cc9b64298360fd4a07992 sbc-2.0.tar.xz +sha256 426633cabd7c798236443516dfa8335b47e004b0ef37ff107e0c7ead3299fcc2 sbc-2.1.tar.xz # sha256 locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk index 115867fa0a..2ee1a75ae8 100644 --- a/package/sbc/sbc.mk +++ b/package/sbc/sbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -SBC_VERSION = 2.0 +SBC_VERSION = 2.1 SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth SBC_INSTALL_STAGING = YES diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 1160f3f2bb..a610b17140 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 6025e5dc6cddd532ff960d14e68ced5f42a1916b23a73fea6bcb437f06992eaf sdbus-cpp-2.1.0.tar.gz +sha256 da69a0104beb6e51415a59f1571a47beb1eacc65cc6027b250eb1cf13ff4f802 sdbus-cpp-2.2.1.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index a01bcd22c6..abe12c05b9 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 2.1.0 +SDBUS_CPP_VERSION = 2.2.1 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd diff --git a/package/signal-estimator/0001-Bump-minimal-cmake-version-to-3.5.patch b/package/signal-estimator/0001-Bump-minimal-cmake-version-to-3.5.patch new file mode 100644 index 0000000000..b2316edd9b --- /dev/null +++ b/package/signal-estimator/0001-Bump-minimal-cmake-version-to-3.5.patch @@ -0,0 +1,22 @@ +From 1c6a2dbda2e76782c3ae92eb25731352dcbd0f7c Mon Sep 17 00:00:00 2001 +From: Victor Gaydov +Date: Sat, 16 Sep 2023 14:58:20 +0400 +Subject: [PATCH] Bump minimal cmake version to 3.5 + +Upstream: https://github.com/gavv/signal-estimator/commit/1c6a2dbda2e76782c3ae92eb25731352dcbd0f7c + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c5fadfb..78967cd2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0.0) ++cmake_minimum_required(VERSION 3.5) + + project(SignalEstimator) + diff --git a/package/sigsum-go/Config.in b/package/sigsum-go/Config.in new file mode 100644 index 0000000000..15a0c27223 --- /dev/null +++ b/package/sigsum-go/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_SIGSUM_GO + bool "sigsum-go" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO + select BR2_PACKAGE_SIGSUM_GO_VERIFY if \ + !BR2_PACKAGE_SIGSUM_GO_KEY && \ + !BR2_PACKAGE_SIGSUM_GO_POLICY && \ + !BR2_PACKAGE_SIGSUM_GO_SUBMIT && \ + !BR2_PACKAGE_SIGSUM_GO_TOKEN + help + Command-line utilities for interacting with Sigsum logs. + + https://git.glasklar.is/sigsum/core/sigsum-go/ + +if BR2_PACKAGE_SIGSUM_GO + +config BR2_PACKAGE_SIGSUM_GO_KEY + bool "sigsum-key" + +config BR2_PACKAGE_SIGSUM_GO_POLICY + bool "sigsum-policy" + +config BR2_PACKAGE_SIGSUM_GO_SUBMIT + bool "sigsum-submit" + +config BR2_PACKAGE_SIGSUM_GO_TOKEN + bool "sigsum-token" + +config BR2_PACKAGE_SIGSUM_GO_VERIFY + bool "sigsum-verify" + +endif diff --git a/package/sigsum-go/Config.in.host b/package/sigsum-go/Config.in.host new file mode 100644 index 0000000000..5bc876603f --- /dev/null +++ b/package/sigsum-go/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_SIGSUM_GO + bool "host sigsum-go" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO + help + Command-line utilities for interacting with Sigsum logs. + + https://git.glasklar.is/sigsum/core/sigsum-go/ diff --git a/package/sigsum-go/sigsum-go.hash b/package/sigsum-go/sigsum-go.hash new file mode 100644 index 0000000000..b032e1839d --- /dev/null +++ b/package/sigsum-go/sigsum-go.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9056406413868fe68a3fcc6415dff5a0045b35baa2242a17fea7a697b1c68e3d sigsum-go-v0.13.1-git4-go2.tar.gz +sha256 6a1e3378dcd18baade08ac30ec4ba33b72d1b1697c00226ef85b9c9cefdb4e65 LICENSE diff --git a/package/sigsum-go/sigsum-go.mk b/package/sigsum-go/sigsum-go.mk new file mode 100644 index 0000000000..4f01be56a5 --- /dev/null +++ b/package/sigsum-go/sigsum-go.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# sigsum-go +# +################################################################################ + +SIGSUM_GO_VERSION = v0.13.1 +SIGSUM_GO_SITE = https://git.glasklar.is/sigsum/core/sigsum-go +SIGSUM_GO_SITE_METHOD = git +SIGSUM_GO_LICENSE = BSD-2-Clause +SIGSUM_GO_LICENSE_FILES = LICENSE + +SIGSUM_GO_GOMOD = sigsum.org/sigsum-go + +ifeq ($(BR2_PACKAGE_SIGSUM_GO_KEY),y) +SIGSUM_GO_BUILD_TARGETS += cmd/sigsum-key +endif + +ifeq ($(BR2_PACKAGE_SIGSUM_GO_POLICY),y) +SIGSUM_GO_BUILD_TARGETS += cmd/sigsum-policy +endif + +ifeq ($(BR2_PACKAGE_SIGSUM_GO_SUBMIT),y) +SIGSUM_GO_BUILD_TARGETS += cmd/sigsum-submit +endif + +ifeq ($(BR2_PACKAGE_SIGSUM_GO_TOKEN),y) +SIGSUM_GO_BUILD_TARGETS += cmd/sigsum-token +endif + +ifeq ($(BR2_PACKAGE_SIGSUM_GO_VERIFY),y) +SIGSUM_GO_BUILD_TARGETS += cmd/sigsum-verify +endif + +HOST_SIGSUM_GO_GOMOD = sigsum.org/sigsum-go +HOST_SIGSUM_GO_BUILD_TARGETS = \ + cmd/sigsum-key \ + cmd/sigsum-submit \ + cmd/sigsum-token \ + cmd/sigsum-verify + +$(eval $(golang-package)) +$(eval $(host-golang-package)) diff --git a/package/snagboot/snagboot.hash b/package/snagboot/snagboot.hash index e5978617aa..6fff4c94c1 100644 --- a/package/snagboot/snagboot.hash +++ b/package/snagboot/snagboot.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a3ace4245472141c0cdcd8e095530652ce95d804f7515a29613ddb07d2c32033 snagboot-2.4.tar.gz +sha256 03b3793feb9d926f5cb4f1c89f7a22075247fe91942c7be13065b6b62029376e snagboot-2.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/snagboot/snagboot.mk b/package/snagboot/snagboot.mk index 12f77c0b14..64b8b6fcc9 100644 --- a/package/snagboot/snagboot.mk +++ b/package/snagboot/snagboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAGBOOT_VERSION = 2.4 +SNAGBOOT_VERSION = 2.5 SNAGBOOT_SITE = $(call github,bootlin,snagboot,v$(SNAGBOOT_VERSION)) SNAGBOOT_LICENSE = GPL-2.0 SNAGBOOT_LICENSE_FILES = LICENSE diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index 0439ca8a7e..a86b36b349 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86 snappy-1.2.1.tar.gz +sha256 90f74bc1fbf78a6c56b3c4a082a05103b3a56bb17bca1a27e052ea11723292dc snappy-1.2.2.tar.gz sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index 21c76cd50d..57c688b673 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPPY_VERSION = 1.2.1 +SNAPPY_VERSION = 1.2.2 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash index 0b02a35792..a16134deb6 100644 --- a/package/speechd/speechd.hash +++ b/package/speechd/speechd.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cc4b388fce40681eaff3545e9cc0642216c13c420d5676a4d28c957ddcb916de speechd-0.11.5.tar.gz +sha256 32a730f6fb5981b9bec7e04f3674fd7d29e54935f46cf6354dbb9ab1f9b23b2d speechd-0.12.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 669bec0634..5bb40bb570 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPEECHD_VERSION = 0.11.5 +SPEECHD_VERSION = 0.12.1 SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL @@ -27,6 +27,7 @@ SPEECHD_CONF_OPTS = \ --without-voxin \ --without-ivona \ --without-pico \ + --without-pipewire \ --without-baratinoo \ --without-kali \ --without-pulse \ diff --git a/package/swugenerator/swugenerator.hash b/package/swugenerator/swugenerator.hash index 184fd86e27..75a902f2c4 100644 --- a/package/swugenerator/swugenerator.hash +++ b/package/swugenerator/swugenerator.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 bb816a77278a2d320e36cdd6fd1bb9b8318b4ef4ccd05e79bb1d5ee631a1d5c1 swugenerator-0.5.tar.gz +sha256 06098c4b3a6c3e5946a11929f95f280baacb512fc4154e16af2262c60a36cbc6 swugenerator-0.6.tar.gz # Locally computed sha256 checksums sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/package/swugenerator/swugenerator.mk b/package/swugenerator/swugenerator.mk index 5acabc2036..a892002369 100644 --- a/package/swugenerator/swugenerator.mk +++ b/package/swugenerator/swugenerator.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUGENERATOR_VERSION = 0.5 +SWUGENERATOR_VERSION = 0.6 SWUGENERATOR_SITE = $(call github,sbabic,swugenerator,$(SWUGENERATOR_VERSION)) SWUGENERATOR_LICENSE = GPL-3.0 SWUGENERATOR_LICENSE_FILES = LICENSE diff --git a/package/termcolor/0001-Fix-CI-matrix-and-CMake-deprecations.patch b/package/termcolor/0001-Fix-CI-matrix-and-CMake-deprecations.patch new file mode 100644 index 0000000000..4e30df5f03 --- /dev/null +++ b/package/termcolor/0001-Fix-CI-matrix-and-CMake-deprecations.patch @@ -0,0 +1,270 @@ +From 89f20096bef51de347ec6f99345f65147359bd7c Mon Sep 17 00:00:00 2001 +From: Ihor Kalnytskyi +Date: Thu, 8 Aug 2024 22:58:42 +0300 +Subject: [PATCH] Fix CI matrix and CMake deprecations (#76) + +Upstream: https://github.com/ikalnytskyi/termcolor/commit/89f20096bef51de347ec6f99345f65147359bd7c + +Signed-off-by: Bernd Kuhls +--- + .github/workflows/cmake.yml | 10 +++--- + .github/workflows/macos.yml | 12 ++++--- + .github/workflows/ubuntu.yml | 46 ++++++++++++++++++------- + .github/workflows/windows.yml | 4 +-- + CMakeLists.txt | 2 +- + examples/cmake-external/CMakeLists.txt | 4 +-- + examples/cmake-fetch/CMakeLists.txt | 11 ++---- + examples/cmake-package/CMakeLists.txt | 2 +- + examples/cmake-submodule/CMakeLists.txt | 2 +- + 9 files changed, 55 insertions(+), 38 deletions(-) + +diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml +index eb61a4f..bdcfc83 100644 +--- a/.github/workflows/cmake.yml ++++ b/.github/workflows/cmake.yml +@@ -11,7 +11,7 @@ jobs: + runs-on: ubuntu-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: | + mkdir -p $GITHUB_WORKSPACE/tmp/termcolor && cd "$_" + cmake $GITHUB_WORKSPACE +@@ -26,18 +26,18 @@ jobs: + runs-on: ubuntu-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: sudo pip install cmake + - run: | + mkdir -p $GITHUB_WORKSPACE/tmp/example && cd "$_" +- /usr/local/bin/cmake $GITHUB_WORKSPACE/examples/cmake-fetch ++ cmake $GITHUB_WORKSPACE/examples/cmake-fetch + make && ./example + + submodule: + runs-on: ubuntu-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: | + mkdir -p $GITHUB_WORKSPACE/tmp/example && cd "$_" + cmake $GITHUB_WORKSPACE/examples/cmake-submodule +@@ -47,7 +47,7 @@ jobs: + runs-on: ubuntu-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: | + mkdir -p $GITHUB_WORKSPACE/tmp/example && cd "$_" + cmake $GITHUB_WORKSPACE/examples/cmake-external +diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml +index 134f137..ce99070 100644 +--- a/.github/workflows/macos.yml ++++ b/.github/workflows/macos.yml +@@ -6,21 +6,23 @@ on: + pull_request: + branches: [master] + +-jobs: ++jobs: + MacOS: + runs-on: macos-latest + strategy: + matrix: + compiler: +- - Xcode_10.3 +- - Xcode_11.7 +- - Xcode_12.4 ++ - Xcode_15.4 ++ - Xcode_15.3 ++ - Xcode_15.2 ++ - Xcode_15.1 ++ - Xcode_14.3.1 + + env: + CXXFLAGS: -std=c++11 + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: sudo xcode-select -s /Applications/${{ matrix.compiler }}.app/Contents/Developer + - run: cmake -DTERMCOLOR_TESTS=ON . + - run: cmake --build . +diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml +index 21acca5..51ec02b 100644 +--- a/.github/workflows/ubuntu.yml ++++ b/.github/workflows/ubuntu.yml +@@ -8,23 +8,44 @@ on: + + jobs: + Ubuntu-Clang: +- runs-on: ubuntu-latest + strategy: + matrix: +- clang-compiler: +- - "6.0" +- - "7" +- - "8" +- - "9" +- - "10" +- - "11" ++ include: ++ - clang-compiler: "6.0" ++ ubuntu-release: ubuntu-20.04 ++ - clang-compiler: "7" ++ ubuntu-release: ubuntu-20.04 ++ - clang-compiler: "8" ++ ubuntu-release: ubuntu-20.04 ++ - clang-compiler: "9" ++ ubuntu-release: ubuntu-20.04 ++ - clang-compiler: "10" ++ ubuntu-release: ubuntu-20.04 ++ - clang-compiler: "11" ++ ubuntu-release: ubuntu-22.04 ++ - clang-compiler: "12" ++ ubuntu-release: ubuntu-22.04 ++ - clang-compiler: "13" ++ ubuntu-release: ubuntu-22.04 ++ - clang-compiler: "14" ++ ubuntu-release: ubuntu-22.04 ++ - clang-compiler: "15" ++ ubuntu-release: ubuntu-22.04 ++ - clang-compiler: "16" ++ ubuntu-release: ubuntu-24.04 ++ - clang-compiler: "17" ++ ubuntu-release: ubuntu-24.04 ++ - clang-compiler: "18" ++ ubuntu-release: ubuntu-24.04 + + env: + CXX: clang++-${{ matrix.clang-compiler }} + CXXFLAGS: -std=c++11 + ++ runs-on: ${{ matrix.ubuntu-release }} ++ + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: sudo apt update + - run: sudo apt -y install clang-${{ matrix.clang-compiler }} + - run: cmake -DTERMCOLOR_TESTS=ON . +@@ -36,17 +57,16 @@ jobs: + strategy: + matrix: + gcc-compiler: +- - "7" +- - "8" +- - "9" + - "10" ++ - "11" ++ - "12" + + env: + CXX: g++-${{ matrix.gcc-compiler }} + CXXFLAGS: -std=c++11 + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: sudo apt update + - run: sudo apt -y install g++-${{ matrix.gcc-compiler }} + - run: cmake -DTERMCOLOR_TESTS=ON . +diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml +index c345782..25ff37f 100644 +--- a/.github/workflows/windows.yml ++++ b/.github/workflows/windows.yml +@@ -11,7 +11,7 @@ jobs: + runs-on: windows-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: cmake -DTERMCOLOR_TESTS=ON . + - run: cmake --build . + - run: ./Debug/test_termcolor.exe +@@ -20,7 +20,7 @@ jobs: + runs-on: windows-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + - run: cmake -DCMAKE_SH="CMAKE_SH-NOTFOUND" -DTERMCOLOR_TESTS=ON -G "MinGW Makefiles" . + - run: cmake --build . + - run: ./test_termcolor +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0bfcd6..da4d5d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(termcolor) + + # +diff --git a/examples/cmake-external/CMakeLists.txt b/examples/cmake-external/CMakeLists.txt +index 525b2a8..077913e 100644 +--- a/examples/cmake-external/CMakeLists.txt ++++ b/examples/cmake-external/CMakeLists.txt +@@ -1,10 +1,10 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(example) + + include(ExternalProject) + + ExternalProject_Add(termcolor_project +- GIT_REPOSITORY git://github.com/ikalnytskyi/termcolor.git ++ GIT_REPOSITORY https://github.com/ikalnytskyi/termcolor.git + GIT_TAG origin/master + + # Termcolor is a header-only library which means we need to +diff --git a/examples/cmake-fetch/CMakeLists.txt b/examples/cmake-fetch/CMakeLists.txt +index 545184f..f0e7e27 100644 +--- a/examples/cmake-fetch/CMakeLists.txt ++++ b/examples/cmake-fetch/CMakeLists.txt +@@ -1,17 +1,12 @@ +-cmake_minimum_required(VERSION 3.11) ++cmake_minimum_required(VERSION 3.14) + project(example) + + include(FetchContent) + + FetchContent_Declare(termcolor +- GIT_REPOSITORY git://github.com/ikalnytskyi/termcolor.git ++ GIT_REPOSITORY https://github.com/ikalnytskyi/termcolor.git + GIT_TAG origin/master) +-FetchContent_GetProperties(termcolor) +- +-if(NOT termcolor_POPULATED) +- FetchContent_Populate(termcolor) +- add_subdirectory(${termcolor_SOURCE_DIR} ${termcolor_BINARY_DIR} EXCLUDE_FROM_ALL) +-endif() ++FetchContent_MakeAvailable(termcolor) + + add_executable(${CMAKE_PROJECT_NAME} example.cpp) + target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE termcolor) +diff --git a/examples/cmake-package/CMakeLists.txt b/examples/cmake-package/CMakeLists.txt +index 3f78a57..cf3b988 100644 +--- a/examples/cmake-package/CMakeLists.txt ++++ b/examples/cmake-package/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(example) + + find_package(termcolor REQUIRED) +diff --git a/examples/cmake-submodule/CMakeLists.txt b/examples/cmake-submodule/CMakeLists.txt +index 5673372..3e7bece 100644 +--- a/examples/cmake-submodule/CMakeLists.txt ++++ b/examples/cmake-submodule/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(example) + + add_subdirectory(../.. ${CMAKE_CURRENT_BINARY_DIR}/termcolor EXCLUDE_FROM_ALL) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 75396c9164..a2ccc28e29 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 09496504e78a9896eaf7689929f4fa0ab40dde90d202259aa4dcf6ec32fe528f timescaledb-2.21.4.tar.gz +sha256 26575fa9e287a6107a6bf162bacab4932b0df19bee38d28c132f9a2d6591d647 timescaledb-2.23.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 234420c105..80c2b385aa 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.21.4 +TIMESCALEDB_VERSION = 2.23.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE diff --git a/package/ubus/Config.in b/package/ubus/Config.in index 391893e808..21b20abaf3 100644 --- a/package/ubus/Config.in +++ b/package/ubus/Config.in @@ -4,7 +4,7 @@ comment "ubus needs a toolchain w/ dynamic library" config BR2_PACKAGE_UBUS bool "ubus" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libubox -> json-c depends on !BR2_STATIC_LIBS # libubox select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_JSON_C diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash index e35f37b03d..3d8206b974 100644 --- a/package/ubus/ubus.hash +++ b/package/ubus/ubus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ba7602c660cb2c15c0e04942414e4cf3d96622622406c5fc3b88895694aebb9f ubus-afa57cce0aff82f4a7a0e509d4387ebc23dd3be7-git4.tar.gz +sha256 f625bda868133e28749b9eed64f9c3a838c75594e46a6a536e7e3582fe4da8e3 ubus-3cc98db1a422dcf560f2d6347fd410f17565a89d-git4.tar.gz sha256 a3caa6c0e90c87b7c97c2ac3d0c0d416082ef777215faec2e9b24ea6e68f6988 ubusd_acl.h diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index 913c0e3e39..c0f0264065 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBUS_VERSION = afa57cce0aff82f4a7a0e509d4387ebc23dd3be7 +UBUS_VERSION = 3cc98db1a422dcf560f2d6347fd410f17565a89d UBUS_SITE = https://git.openwrt.org/project/ubus.git UBUS_SITE_METHOD = git diff --git a/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch b/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch index 4c455d28fc..cdd4b6c64f 100644 --- a/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch +++ b/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch @@ -13,6 +13,8 @@ Signed-off-by: Gwenhael Goavec-Merou [Fabrice: updated for 4.3.0.0] Signed-off-by: Fabrice Fontaine [Upstream status: reverted (https://github.com/EttusResearch/uhd/commit/1a00949b19eaecb84af0f27c370400dc71a9fd84)] +[Bernd: rebased for version 4.9.0.1] +Signed-off-by: Bernd Kuhls --- host/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) @@ -21,9 +23,9 @@ diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 8f72ece76..a7731ffbd 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt -@@ -291,9 +291,12 @@ set(UHD_BOOST_REQUIRED_COMPONENTS - system +@@ -323,9 +323,12 @@ set(UHD_BOOST_REQUIRED_COMPONENTS serialization + #system Boost.System is used, but explicitly listing it causes errors on some systems. thread - unit_test_framework ) @@ -34,7 +36,7 @@ index 8f72ece76..a7731ffbd 100644 + include(UHDBoost) - include_directories(${Boost_INCLUDE_DIRS}) + # Include boost headers as system headers to avoid compiler warnings from them. -- 2.26.2 diff --git a/package/uhd/uhd.hash b/package/uhd/uhd.hash index 3282da2ec7..be79a138dd 100644 --- a/package/uhd/uhd.hash +++ b/package/uhd/uhd.hash @@ -1,5 +1,5 @@ # Locally calculated: -sha256 afe56842587ce72d6a57535a2b15c061905f0a039abcc9d79f0106f072a00d10 uhd-4.7.0.0.tar.gz +sha256 0be26a139f23041c1fb6e9666d84cba839460e3c756057dc48dc067cc356a7bc uhd-4.9.0.1.tar.gz sha256 94cc36ada2641d037980bf6c2418a750ac10a115ae11de5a5cda6177769dbd4c LICENSE.md sha256 70bf7e79c8cd73a81f97ce81745ea0719a617eebe299a61868165daeae71fff2 host/LICENSE sha256 206adc03412b6c5b71b9c9df9c1f2e60e11833e89393877d5031fd11d332b1d4 fpga/usrp3/LICENSE.md diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk index 52ea06a394..a05675b102 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHD_VERSION = 4.7.0.0 +UHD_VERSION = 4.9.0.1 UHD_SITE = $(call github,EttusResearch,uhd,v$(UHD_VERSION)) UHD_LICENSE = GPL-3.0+, LGPL-3.0+ (fpga/usrp3) UHD_LICENSE_FILES = LICENSE.md host/LICENSE fpga/usrp3/LICENSE.md diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in index eeb169a96d..30101f983d 100644 --- a/package/uhttpd/Config.in +++ b/package/uhttpd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_UHTTPD bool "uhttpd" depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libubox -> json-c depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_JSON_C diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in index fe03b95f20..41210c2039 100644 --- a/package/unionfs/Config.in +++ b/package/unionfs/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_UNIONFS bool "unionfs (FUSE)" - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse - depends on BR2_USE_MMU # libfuse - depends on !BR2_STATIC_LIBS # libfuse - select BR2_PACKAGE_LIBFUSE + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, libfuse3 + depends on BR2_USE_MMU # libfuse, libfuse3 + depends on !BR2_STATIC_LIBS # libfuse, libfuse3 + select BR2_PACKAGE_LIBFUSE3 if !BR2_PACKAGE_LIBFUSE help A userspace unionfs implementation. diff --git a/package/unionfs/unionfs.hash b/package/unionfs/unionfs.hash index 7c4a9f4ffb..7ec654591d 100644 --- a/package/unionfs/unionfs.hash +++ b/package/unionfs/unionfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f56a5579d670e18e0667700bc599acbc0b8217ca1f76b2adb3dad7d2953c4049 LICENSE -sha256 c705072a33a18cbc73ffe799331d43410b6deef5d6f2042038f8fd3ab17b6e2e unionfs-2.1.tar.gz +sha256 026f5302279110ceb7465e5c9e863cd0319ea0dc32ad253d162cf9db0f5e9a81 unionfs-3.7.tar.gz +sha256 b03db54bff4b5ff9d1b4c7ef54513e52afaa32830f36a6da6db8c0fcd35a4431 LICENSE diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk index 12cd368fe3..4909d80a70 100644 --- a/package/unionfs/unionfs.mk +++ b/package/unionfs/unionfs.mk @@ -4,10 +4,18 @@ # ################################################################################ -UNIONFS_VERSION = 2.1 +UNIONFS_VERSION = 3.7 UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION)) -UNIONFS_DEPENDENCIES = libfuse host-pkgconf +UNIONFS_DEPENDENCIES = host-pkgconf UNIONFS_LICENSE = BSD-3-Clause UNIONFS_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_LIBFUSE3),y) +UNIONFS_CONF_OPTS += -DWITH_LIBFUSE3=TRUE +UNIONFS_DEPENDENCIES += libfuse3 +else +UNIONFS_CONF_OPTS += -DWITH_LIBFUSE3=FALSE +UNIONFS_DEPENDENCIES += libfuse +endif + $(eval $(cmake-package)) diff --git a/package/uqmi/Config.in b/package/uqmi/Config.in index 21f0bd9077..5029a06800 100644 --- a/package/uqmi/Config.in +++ b/package/uqmi/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UQMI bool "uqmi" - depends on !BR2_STATIC_LIBS # libubox + depends on !BR2_STATIC_LIBS # libubox, libubox -> json-c depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBUBOX diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in index 540e43689f..c328a6ea12 100644 --- a/package/ustream-ssl/Config.in +++ b/package/ustream-ssl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USTREAM_SSL bool "ustream-ssl" - depends on !BR2_STATIC_LIBS #libubox + depends on !BR2_STATIC_LIBS # libubox + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libubox -> json-c select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS help @@ -10,3 +11,4 @@ config BR2_PACKAGE_USTREAM_SSL comment "ustream-ssl needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash index 9084f9109e..e2196b5b77 100644 --- a/package/ustreamer/ustreamer.hash +++ b/package/ustreamer/ustreamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 592fab2eb10ccb768e19b4e6631e1279d415f23d268a4b45b9d440378beaa570 ustreamer-6.41.tar.gz +sha256 40c10b522c34bcb95bda9844a5a2a06173fea9a5d948882d70740cbe1fe7a8b4 ustreamer-6.42.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk index ef5ac09eeb..bf87dc8abd 100644 --- a/package/ustreamer/ustreamer.mk +++ b/package/ustreamer/ustreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -USTREAMER_VERSION = 6.41 +USTREAMER_VERSION = 6.42 USTREAMER_SITE = $(call github,pikvm,ustreamer,v$(USTREAMER_VERSION)) USTREAMER_LICENSE = GPL-3.0+ USTREAMER_LICENSE_FILES = LICENSE diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index d1c2986ca6..af850c03d6 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.41/sha256sums.asc -sha256 be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 util-linux-2.41.1.tar.xz +sha256 6062a1d89b571a61932e6fc0211f36060c4183568b81ee866cf363bce9f6583e util-linux-2.41.2.tar.xz # License files, locally calculated sha256 4c2db318192bda62f3f8fcf71488bb5e602ae4385eba281d711b46cc13a40bb3 README.licensing sha256 527f738966ca396cd5a68c1509390de2a780c6b614d9ee57f7544a6161938ed1 Documentation/licenses/COPYING.BSD-2-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index d1abdbdc9e..16d086f333 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.41 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) diff --git a/package/wampcc/0004-Make-compatible-with-CMake-3.8.1.patch b/package/wampcc/0004-Make-compatible-with-CMake-3.8.1.patch new file mode 100644 index 0000000000..69e656a3a6 --- /dev/null +++ b/package/wampcc/0004-Make-compatible-with-CMake-3.8.1.patch @@ -0,0 +1,35 @@ +From 95cbe3bb3e7cfa32b96356edbd3ce7a8a3bb9018 Mon Sep 17 00:00:00 2001 +From: GHANNADZADEH Saman +Date: Mon, 4 Mar 2019 16:21:40 +0000 +Subject: [PATCH] Make compatible with CMake 3.8.1 + +This ups the minimum CMake version, and declares th package version in +the `project(...)` command to be compatible with CMake policy CMP0047. + +Upstream: https://github.com/darrenjs/wampcc/commit/95cbe3bb3e7cfa32b96356edbd3ce7a8a3bb9018 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ae1a370..251e0caa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,11 @@ +-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) + +-project(wampcc) +- +-# Version number + set (WAMPCC_VERSION_MAJOR 1) + set (WAMPCC_VERSION_MINOR 6) + set (WAMPCC_VERSION "${WAMPCC_VERSION_MAJOR}.${WAMPCC_VERSION_MINOR}") ++project(wampcc VERSION ${WAMPCC_VERSION}) ++ ++# Version number + # Include extra cmake modules + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") + diff --git a/package/wampcc/0005-Build-Debian-packages-using-CPack.patch b/package/wampcc/0005-Build-Debian-packages-using-CPack.patch new file mode 100644 index 0000000000..6984b47e57 --- /dev/null +++ b/package/wampcc/0005-Build-Debian-packages-using-CPack.patch @@ -0,0 +1,69 @@ +From 36ef37248c1608a366846d17d60fec217e515377 Mon Sep 17 00:00:00 2001 +From: GHANNADZADEH Saman +Date: Mon, 4 Mar 2019 16:28:36 +0000 +Subject: [PATCH] Build Debian packages using CPack + +Upstream: https://github.com/darrenjs/wampcc/commit/36ef37248c1608a366846d17d60fec217e515377 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 5 ++++- + cmake/MakeDebPackages.cmake | 26 ++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+), 1 deletion(-) + create mode 100644 cmake/MakeDebPackages.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a8b528d..a9fb364c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ project(wampcc VERSION ${WAMPCC_VERSION}) + + # Version number + # Include extra cmake modules +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") ++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake") + + + ## +@@ -37,6 +37,9 @@ set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation dire + set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") + set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") + ++# Allow settin of RPATH for install ++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ + ## + ## Platform checks, and generate config.h + ## +diff --git a/cmake/MakeDebPackages.cmake b/cmake/MakeDebPackages.cmake +new file mode 100644 +index 00000000..66ecb336 +--- /dev/null ++++ b/cmake/MakeDebPackages.cmake +@@ -0,0 +1,26 @@ ++set(CPACK_PACKAGE_VENDOR "Darren Smith") ++SET(CPACK_PACKAGE_CONTACT "Darren Smith") ++ ++set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/lib") ++ ++SET(CPACK_GENERATOR "DEB") ++SET(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) ++set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) ++set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) ++ ++set(CPACK_DEB_COMPONENT_INSTALL ON) ++set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS YES) ++ ++set(CPACK_COMPONENTS_ALL lib dev) ++set(CPACK_COMPONENT_DEV_DEPENDS lib) ++ ++set(CPACK_DEBIAN_LIB_PACKAGE_NAME libwampcc) ++set(CPACK_DEBIAN_DEV_PACKAGE_NAME libwampcc-dev) ++ ++if(BUILD_UTILS) ++ list(APPEND CPACK_COMPONENTS_ALL util) ++ set(CPACK_COMPONENT_UTIL_DEPENDS lib) ++ set(CPACK_DEBIAN_UTIL_PACKAGE_NAME wampcc-utils) ++endif() ++ ++include(CPack) diff --git a/package/wampcc/0006-Use-CMake-policy-to-set-MSVC-runtime-options.patch b/package/wampcc/0006-Use-CMake-policy-to-set-MSVC-runtime-options.patch new file mode 100644 index 0000000000..5fedd90ad2 --- /dev/null +++ b/package/wampcc/0006-Use-CMake-policy-to-set-MSVC-runtime-options.patch @@ -0,0 +1,38 @@ +From 047f8742e721db4d0e91bb6313ec668900975de3 Mon Sep 17 00:00:00 2001 +From: Saman Ghannadzadeh +Date: Fri, 8 Sep 2023 15:09:23 +0100 +Subject: [PATCH] Use CMake policy to set MSVC runtime options + +Currently, we manually set the MSVC flags to set the runtime to be +static or dynamic. This commit switches to letting CMake automatically do this, +instead of us manually setting flags. + +This should make the CMake recipe more robust. + +Upstream: https://github.com/darrenjs/wampcc/commit/047f8742e721db4d0e91bb6313ec668900975de3 + +Signed-off-by: Bernd Kuhls +[backported for 1.6] +--- + CMakeLists.txt | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c261cb..28e1965 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,10 +1,13 @@ +-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR) + + set (WAMPCC_VERSION_MAJOR 1) + set (WAMPCC_VERSION_MINOR 6) + set (WAMPCC_VERSION "${WAMPCC_VERSION_MAJOR}.${WAMPCC_VERSION_MINOR}") + project(wampcc VERSION ${WAMPCC_VERSION}) + ++# Allows for setting MSVC static runtime ++cmake_policy(SET CMP0091 NEW) ++ + # Version number + # Include extra cmake modules + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake") diff --git a/package/waylandpp/0001-add-missing-cstdint-include.patch b/package/waylandpp/0001-add-missing-cstdint-include.patch deleted file mode 100644 index 13b0ce49ad..0000000000 --- a/package/waylandpp/0001-add-missing-cstdint-include.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 8 Jan 2023 18:24:53 +0000 -Subject: [PATCH] add missing include - -Upcoming `gcc-13` made `` leaner and does not include `` -implicitly anymore. As a result build fails without the change as: - - [ 2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o - scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type - 378 | uint32_t width = 0; - | ^~~~~~~~ - -Upstream: https://github.com/NilsBrause/waylandpp/pull/71 - -Signed-off-by: Bernd Kuhls ---- - include/wayland-client.hpp | 1 + - scanner/scanner.cpp | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp -index a3f782b..4598a0e 100644 ---- a/include/wayland-client.hpp -+++ b/include/wayland-client.hpp -@@ -29,6 +29,7 @@ - /** \file */ - - #include -+#include - #include - #include - #include -diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp -index bebd71e..37cf7ff 100644 ---- a/scanner/scanner.cpp -+++ b/scanner/scanner.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "pugixml.hpp" -@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) - wayland_hpp << "#pragma once" << std::endl - << std::endl - << "#include " << std::endl -+ << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl -@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) - wayland_server_hpp << "#pragma once" << std::endl - << std::endl - << "#include " << std::endl -+ << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl - << "#include " << std::endl diff --git a/package/waylandpp/waylandpp.hash b/package/waylandpp/waylandpp.hash index a3eb5379af..8513060f91 100644 --- a/package/waylandpp/waylandpp.hash +++ b/package/waylandpp/waylandpp.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5 waylandpp-1.0.0.tar.gz +sha256 49c362fa5db28ab5472968215b88f1fbe3a7b7f57818dde722fd7d38997d940a waylandpp-1.0.1.tar.gz sha256 3eee5022ce84ead344e1c51b9d00c7f450f53003fe096fe460d66c616fe56782 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt diff --git a/package/waylandpp/waylandpp.mk b/package/waylandpp/waylandpp.mk index 4a0d58ba50..f177c6e5be 100644 --- a/package/waylandpp/waylandpp.mk +++ b/package/waylandpp/waylandpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLANDPP_VERSION = 1.0.0 +WAYLANDPP_VERSION = 1.0.1 WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION)) WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner) WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt diff --git a/package/websocketpp/0002-Update-minimum-required-CMake-version.patch b/package/websocketpp/0002-Update-minimum-required-CMake-version.patch new file mode 100644 index 0000000000..da8e7e1da4 --- /dev/null +++ b/package/websocketpp/0002-Update-minimum-required-CMake-version.patch @@ -0,0 +1,26 @@ +From deb0a334471362608958ce59a6b0bcd3e5b73c24 Mon Sep 17 00:00:00 2001 +From: Alexander Bock +Date: Mon, 31 Mar 2025 22:04:07 +0200 +Subject: [PATCH] Update minimum required CMake version to comply with CMake + 4.0 + +Upstream: https://github.com/zaphoyd/websocketpp/commit/deb0a334471362608958ce59a6b0bcd3e5b73c24 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f93e243a..92990c7dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ + ############ Setup project and cmake + # Minimum cmake requirement. We should require a quite recent + # cmake for the dependency find macros etc. to be up to date. +-cmake_minimum_required (VERSION 2.8.8) ++cmake_minimum_required (VERSION 3.10) + + ############ Paths + diff --git a/package/woff2/0002-Fix-the-build-with-CMake-4.patch b/package/woff2/0002-Fix-the-build-with-CMake-4.patch new file mode 100644 index 0000000000..c516c67ef4 --- /dev/null +++ b/package/woff2/0002-Fix-the-build-with-CMake-4.patch @@ -0,0 +1,37 @@ +From ee31ca0647decc493e992eaa3dc5be9d9e1bc871 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Sat, 25 Oct 2025 22:19:21 +0300 +Subject: [PATCH] Fix the build with CMake 4 + +Require CMake 3.5, which is the latest version that CMake 4 is +backwards-compatible with. The CMake build system does not need +any change otherwise. + +Fixes #183 + +Upstream: https://github.com/google/woff2/pull/187 +Signed-off-by: Adrian Perez de Castro +--- + CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ecfbb83..6525747 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,11 +3,7 @@ + # Distributed under MIT license. + # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT + +-# Ubuntu 12.04 LTS has CMake 2.8.7, and is an important target since +-# several CI services, such as Travis and Drone, use it. Solaris 11 +-# has 2.8.6, and it's not difficult to support if you already have to +-# support 2.8.7. +-cmake_minimum_required(VERSION 2.8.6) ++cmake_minimum_required(VERSION 3.5.0) + + project(woff2) + +-- +2.51.1 + diff --git a/package/xilinx-fpgautil/xilinx-fpgautil.hash b/package/xilinx-fpgautil/xilinx-fpgautil.hash index d214fd4269..b66ef8186b 100644 --- a/package/xilinx-fpgautil/xilinx-fpgautil.hash +++ b/package/xilinx-fpgautil/xilinx-fpgautil.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a0185fda33a538379eb5ae48253f721037485be85c51555e2ad49e322d389429 xilinx-fpgautil-xlnx-rel-v2025.1.tar.gz +sha256 043d87f12550283008ee0850f18ca807a48cc4ee085182ae84f8bed65fa73425 xilinx-fpgautil-xlnx-rel-v2025.2.tar.gz sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e COPYING.MIT diff --git a/package/xilinx-fpgautil/xilinx-fpgautil.mk b/package/xilinx-fpgautil/xilinx-fpgautil.mk index d41af96ee5..f53ed80e2f 100644 --- a/package/xilinx-fpgautil/xilinx-fpgautil.mk +++ b/package/xilinx-fpgautil/xilinx-fpgautil.mk @@ -4,7 +4,7 @@ # ################################################################################ -XILINX_FPGAUTIL_VERSION = xlnx-rel-v2025.1 +XILINX_FPGAUTIL_VERSION = xlnx-rel-v2025.2 XILINX_FPGAUTIL_SITE = $(call github,Xilinx,meta-xilinx,$(XILINX_FPGAUTIL_VERSION)) XILINX_FPGAUTIL_LICENSE = MIT XILINX_FPGAUTIL_LICENSE_FILES = COPYING.MIT diff --git a/package/yajl/0005-Allow-build-with-CMake-4.0.0.patch b/package/yajl/0005-Allow-build-with-CMake-4.0.0.patch new file mode 100644 index 0000000000..8f162b2249 --- /dev/null +++ b/package/yajl/0005-Allow-build-with-CMake-4.0.0.patch @@ -0,0 +1,68 @@ +From dd88e2ea2fc3f045722f6fee362af2643b5394f5 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 28 Mar 2025 09:31:40 +0000 +Subject: [PATCH] Allow build with CMake 4.0.0 + +fixes deprecated cmake option and uses cmake 2.8.0 TARGET_FILE +update cmake supported minimum versions to 2.8.0...3.10 + +ref: +- https://cmake.org/cmake/help/latest/policy/CMP0026.html + +CMake Error at .../CMakeLists.txt: (GET_TARGET_PROPERTY): + The LOCATION property may not be read from target "json_...". Use the + target name directly with add_custom_command, or use the generator + expression $, as appropriate. + +Signed-off-by: Rudi Heitbaum +Fixes: https://autobuild.buildroot.org/results/0b6/0b6ada93f45c16cc8c558ec23a0eb56da2aa86e9 +Upstream: https://github.com/lloyd/yajl/pull/256 +--- + CMakeLists.txt | 2 +- + reformatter/CMakeLists.txt | 4 +--- + verify/CMakeLists.txt | 4 +--- + 3 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471eee13..deba3a40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ + # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10) + + PROJECT(YetAnotherJSONParser C) + +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index 52a9bee8..267d02e2 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -39,9 +39,7 @@ IF (NOT WIN32) + ENDIF (NOT WIN32) + + # copy the binary into the output directory +-GET_TARGET_PROPERTY(binPath json_reformat LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt +index 967fca16..2f390082 100644 +--- a/verify/CMakeLists.txt ++++ b/verify/CMakeLists.txt +@@ -33,9 +33,7 @@ ELSE() + ENDIF() + + # copy in the binary +-GET_TARGET_PROPERTY(binPath json_verify LOCATION) +- + ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${binDir}) + + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) diff --git a/package/yaml-cpp/0002-Specify-CMake-policy-range-to-avoid-deprecation-warning.patch b/package/yaml-cpp/0002-Specify-CMake-policy-range-to-avoid-deprecation-warning.patch new file mode 100644 index 0000000000..6ab3df96cf --- /dev/null +++ b/package/yaml-cpp/0002-Specify-CMake-policy-range-to-avoid-deprecation-warning.patch @@ -0,0 +1,26 @@ +From c2680200486572baf8221ba052ef50b58ecd816e Mon Sep 17 00:00:00 2001 +From: Craig Scott +Date: Thu, 17 Aug 2023 08:54:05 +1000 +Subject: [PATCH] Specify CMake policy range to avoid deprecation warning + (#1211) + +Upstream: https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46dc18059..1ae92e2b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ +-# 3.5 is actually available almost everywhere, but this a good minimum +-cmake_minimum_required(VERSION 3.4) ++# 3.5 is actually available almost everywhere, but this a good minimum. ++# 3.14 as the upper policy limit avoids CMake deprecation warnings. ++cmake_minimum_required(VERSION 3.4...3.14) + + # enable MSVC_RUNTIME_LIBRARY target property + # see https://cmake.org/cmake/help/latest/policy/CMP0091.html diff --git a/package/ympd/0003-bump-required-cmake-version-to-3.10.patch b/package/ympd/0003-bump-required-cmake-version-to-3.10.patch new file mode 100644 index 0000000000..72a1966d77 --- /dev/null +++ b/package/ympd/0003-bump-required-cmake-version-to-3.10.patch @@ -0,0 +1,22 @@ +From 5c5862071e7ae982de6f39c9d1679dc496f38a20 Mon Sep 17 00:00:00 2001 +From: "Felix J. Ogris" +Date: Fri, 20 Jun 2025 15:10:38 +0200 +Subject: [PATCH] bump required cmake version to 3.10 + +Upstream: https://github.com/notandy/ympd/pull/199 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 02ee5141d..a8ee3730d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.10) + + project (ympd C) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 226bce51ba..c1e8ad62f3 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -41,6 +41,7 @@ config BR2_PACKAGE_ZABBIX_SERVER_MYSQL config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL bool "postgresql" depends on BR2_USE_MMU # postgresql + depends on !BR2_sparc # postgresql depends on BR2_USE_WCHAR # postgresql depends on BR2_ENABLE_LOCALE # postgresql depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql diff --git a/package/zynaddsubfx/0003-CMake-cleanup.patch b/package/zynaddsubfx/0003-CMake-cleanup.patch new file mode 100644 index 0000000000..b8ced14b17 --- /dev/null +++ b/package/zynaddsubfx/0003-CMake-cleanup.patch @@ -0,0 +1,39 @@ +From ffe9ca1375168dd86c974dbe7c0264fce393150e Mon Sep 17 00:00:00 2001 +From: Johannes Lorenz +Date: Sun, 29 Dec 2024 03:22:44 +0100 +Subject: [PATCH] Add -Werror support, CMake cleanup + +* Raise CMake minimum version to 3.5 (due to deprecation warnings) + +Upstream: https://github.com/zynaddsubfx/zynaddsubfx/commit/ffe9ca1375168dd86c974dbe7c0264fce393150e + +Signed-off-by: Bernd Kuhls +[backported only cmake_minimum_required bump to 3.0.6] +--- + .github/workflows/ccpp.yml | 2 +- + CMakeLists.txt | 3 +- + rtosc | 2 +- + src/CMakeLists.txt | 57 +++++++++++++++++++------------------- + src/Misc/MiddleWare.cpp | 4 ++- + src/UI/MasterUI.fl | 6 ++-- + src/UI/OscilGenUI.fl | 4 +-- + src/UI/PartUI.fl | 6 ++-- + src/UI/SUBnoteUI.fl | 4 +-- + 9 files changed, 45 insertions(+), 43 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e678d939c..9bae0b40d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,10 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") + project(zynaddsubfx) + set(VERSION_MAJOR "3") + set(VERSION_MINOR "0") + set(VERSION_REVISION "6") ++cmake_policy(SET CMP0072 NEW) + + #Set data directory, if any + if(DEFINED ZYN_DATADIR) diff --git a/package/zynaddsubfx/0004-Modernize-CMakeLists.patch b/package/zynaddsubfx/0004-Modernize-CMakeLists.patch new file mode 100644 index 0000000000..3b2ccfd13e --- /dev/null +++ b/package/zynaddsubfx/0004-Modernize-CMakeLists.patch @@ -0,0 +1,24 @@ +From c00fdb161004e06e52ef46ba921014bd15b1601b Mon Sep 17 00:00:00 2001 +From: fundamental +Date: Sat, 4 Nov 2023 16:32:42 +0100 +Subject: [PATCH] Modernize CMakeLists + +Upstream: https://github.com/fundamental/rtosc/commit/c00fdb161004e06e52ef46ba921014bd15b1601b + +Signed-off-by: Bernd Kuhls +[backported only cmake_minimum_required bump] +--- + CMakeLists.txt | 276 +++++++++++++++++---------------------- + cmake/ColorMessage.cmake | 15 ++- + 2 files changed, 131 insertions(+), 160 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e62af32..33d80ac 100644 +--- a/rtosc/CMakeLists.txt ++++ b/rtosc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(RTOSC) + + set(VERSION_MAJOR 0) diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py index 91df427b6f..c785e340d6 100644 --- a/support/testing/tests/package/test_libcamera.py +++ b/support/testing/tests/package/test_libcamera.py @@ -14,6 +14,7 @@ class TestLibCamera(infra.basetest.BRTest): f""" BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y