diff --git a/Config.in.legacy b/Config.in.legacy index 6473947a9a61..c1870613afd0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE + bool "flutter-dynamic-layouts-example has been removed" + select BR2_LEGACY + help + flutter-dynamic-layouts was removed from flutter-packages + as of commit e35f29177495131f0f598fc7ae1ffd74d89edf15. + config BR2_KERNEL_HEADERS_6_9 bool "kernel headers version 6.9.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index c472aa4c53dc..d7d0af35431b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,7 +35,6 @@ F: package/flutter-engine/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ -F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-go-router-example/ F: package/flutter-packages/flutter-image-example/ F: package/flutter-packages/flutter-markdown-example/ @@ -268,12 +267,6 @@ F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -N: Ariel D'Alessandro -F: board/bsh/ -F: configs/imx8mn_bsh_smm_s2_pro_defconfig -F: package/axfsutils/ -F: package/mali-t76x/ - N: Arnaud Aujon F: package/espeak/ @@ -1976,6 +1969,7 @@ F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ F: support/testing/tests/package/test_usbutils.py F: support/testing/tests/package/test_usbutils/ +F: support/testing/tests/package/test_vorbis_tools.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_wine.py @@ -3384,6 +3378,7 @@ F: package/weston/ F: package/wtfutil/ F: package/zisofs-tools/ F: support/download/ +F: support/testing/tests/graphics_base.py N: Yann E. MORIN F: .editorconfig diff --git a/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 02714d06a09c..6f02bfbb22ef 100644 --- a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09c..6f02bfbb22ef 100644 --- a/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/beagleboard/beagleboneai64/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09c..6f02bfbb22ef 100644 --- a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 02714d06a09c..6f02bfbb22ef 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash index c9d043c46f12..8b3df439a053 100644 --- a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 74fe35c9bc73..0b99949745e7 100644 --- a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt index bc59d5fad2ef..123e09cf56c5 100644 --- a/board/raspberrypi/config_0w.txt +++ b/board/raspberrypi/config_0w.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt index bc59d5fad2ef..123e09cf56c5 100644 --- a/board/raspberrypi/config_3.txt +++ b/board/raspberrypi/config_3.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt index 667287112573..88206e9b144d 100644 --- a/board/raspberrypi/config_3_64bit.txt +++ b/board/raspberrypi/config_3_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_3_qt5we.txt b/board/raspberrypi/config_3_qt5we.txt index 752310b17958..3d81a4e5da37 100644 --- a/board/raspberrypi/config_3_qt5we.txt +++ b/board/raspberrypi/config_3_qt5we.txt @@ -22,5 +22,5 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=200 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt index 74a7b270cdf5..9b77d23d7404 100644 --- a/board/raspberrypi/config_4.txt +++ b/board/raspberrypi/config_4.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index a4ae327d2a2d..fcb1c5c30a35 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/raspberrypi/config_cm4io.txt b/board/raspberrypi/config_cm4io.txt index cf7e6df1a1aa..15751e71875b 100644 --- a/board/raspberrypi/config_cm4io.txt +++ b/board/raspberrypi/config_cm4io.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable RTC diff --git a/board/raspberrypi/config_cm4io_64bit.txt b/board/raspberrypi/config_cm4io_64bit.txt index 813f6eba7b89..4884bda553cf 100644 --- a/board/raspberrypi/config_cm4io_64bit.txt +++ b/board/raspberrypi/config_cm4io_64bit.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable RTC diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt index 55095f64a7df..123e09cf56c5 100644 --- a/board/raspberrypi/config_zero2w.txt +++ b/board/raspberrypi/config_zero2w.txt @@ -22,7 +22,7 @@ gpu_mem_256=100 gpu_mem_512=100 gpu_mem_1024=100 -# fixes rpi (3B, 3B+, 3A+, 4B ,zero W and zero 2) ttyAMA0 serial console +# Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach diff --git a/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8b69a5a96453..2bc5030cf2ff 100644 --- a/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 06d32acf42808b682859008292f0591d2d872f19aa1a8021bfcd1c1c626285e6 arm-trusted-firmware-v2.9.tar.gz +sha256 72df0928138de111bf5e75fae47f88a4d1b4930ad52b7902e2b53e117be650c8 arm-trusted-firmware-v2.9-git4.tar.gz diff --git a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8f60864fbf67..f0635a665260 100644 --- a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz +sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 7494e04ead5d..d68ac4bd30db 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz +sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 7494e04ead5d..d68ac4bd30db 100644 --- a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd arm-trusted-firmware-lts-v2.10.4.tar.gz +sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 2fe3dd1146ed..02a6db795a16 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -14,7 +14,12 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.10" + bool "v2.11" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION + bool "latest lts-v2.10.x" + help + Select the latest LTS v2.10.x version available config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION bool "latest lts-v2.8.x" @@ -47,8 +52,9 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.10" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - default "lts-v2.8.13" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION + default "v2.11" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.10.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION + default "lts-v2.8.20" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index 73ab431b9fc9..000000000000 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz -sha256 e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274 arm-trusted-firmware-lts-v2.8.13.tar.gz -sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index abf917948eee..a3a44feea94a 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -16,10 +16,11 @@ ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUST ARM_TRUSTED_FIRMWARE_SITE_METHOD = git else # Handle stable official ATF versions -ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) +ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git +ARM_TRUSTED_FIRMWARE_SITE_METHOD = git # The licensing of custom or from-git versions is unknown. # This is valid only for the latest (i.e. known) version. -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif diff --git a/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash new file mode 100644 index 000000000000..665733711898 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.10.5/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 62af6f1f2e9406d761ace03025f6bf22a0670578b1d0b76092dc1db455746dad arm-trusted-firmware-lts-v2.10.5-git4.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch similarity index 100% rename from boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch rename to boot/arm-trusted-firmware/lts-v2.8.20/0001-build-tools-avoid-unnecessary-link.patch diff --git a/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash new file mode 100644 index 000000000000..6368bf7f988f --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.8.20/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a90617cc2c1791c98d36b9e3d9a7f3f77029897e00c4279ff4ef559b769e9d7b arm-trusted-firmware-lts-v2.8.20-git4.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash new file mode 100644 index 000000000000..984978dc11b0 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.11/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz +sha256 03d5088ff4fbfe989f3c807117356191c263cf27d62ee6916bde8532611728ed docs/license.rst diff --git a/package/Config.in b/package/Config.in index 0472ec2daf54..f2c63ffb6ec6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1408,6 +1408,7 @@ menu "External python modules" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" source "package/python-tomli/Config.in" + source "package/python-tomli-w/Config.in" source "package/python-tomlkit/Config.in" source "package/python-tornado/Config.in" source "package/python-tortoise-orm/Config.in" diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index dfee537a4a41..e0cb65642d44 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz +sha256 dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480 cryptsetup-2.7.4.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d5046d99433b..15cadb284080 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash index e2dfe2f92340..5e172a9a9a94 100644 --- a/package/depot-tools/depot-tools.hash +++ b/package/depot-tools/depot-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 75cc0f9c8bf711c1821b2b1ac873fe75c6fa256f5cdd6a5585a02214ed36d792 depot-tools-8d14454ba4a35fd9d2483842b08815a2357ec86f-git4.tar.gz +sha256 c085a4bc561c90555555461d5810dd406e723618313f24eb2161421f9306b498 depot-tools-75932421da2cd8b5807a4ac52ed2a6f46d7c2120-git4.tar.gz sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index a53afa14d614..0d7048b8eb23 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEPOT_TOOLS_VERSION = 8d14454ba4a35fd9d2483842b08815a2357ec86f +DEPOT_TOOLS_VERSION = 75932421da2cd8b5807a4ac52ed2a6f46d7c2120 DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause diff --git a/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch b/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch deleted file mode 100644 index 125bfc6910b4..000000000000 --- a/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2252a85e59669b5826019f60a98b7a69939dacfd Mon Sep 17 00:00:00 2001 -From: Greg Spencer -Date: Mon, 4 Mar 2024 12:30:41 -0800 -Subject: [PATCH] Skip configuration dependency if unit tests are disabled. - -Commit 88baf62f made gtk+-3.0 an unconditional requirement, see: - -Issue: https://github.com/flutter/flutter/issues/144421 -Upstream: Merged. https://github.com/flutter/engine/pull/51179 - -Signed-off-by: Greg Spencer -Signed-off-by: Adam Duskett ---- - flutter/testing/BUILD.gn | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flutter/testing/BUILD.gn b/flutter/testing/BUILD.gn -index 9eac29452..a7d094695 100644 ---- a/flutter/testing/BUILD.gn -+++ b/flutter/testing/BUILD.gn -@@ -51,7 +51,7 @@ source_set("testing") { - - sources = [ "run_all_unittests.cc" ] - -- if (is_linux) { -+ if (enable_unittests && is_linux) { - # So that we can call gtk_init in main(). - configs += [ "//flutter/shell/platform/linux/config:gtk" ] - } --- -2.44.0 - diff --git a/package/flutter-engine/dot-gclient b/package/flutter-engine/dot-gclient index ba9590a7f5f0..6ead80c8c22b 100644 --- a/package/flutter-engine/dot-gclient +++ b/package/flutter-engine/dot-gclient @@ -8,6 +8,7 @@ solutions = [{ "custom_vars": { "download_android_deps": False, "download_windows_deps": False, - "download_linux_deps": False + "download_linux_deps": False, + "download_fuchsia_deps": False }, }] diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index dfc3c03ef974..020fa2ee8a45 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.19.5 +FLUTTER_ENGINE_VERSION = 3.24.0 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = @@ -67,7 +67,7 @@ FLUTTER_ENGINE_INSTALL_FILES = libflutter_engine.so # Flutter engine includes a bundled patched clang that must be used for # compiling or else there are linking errors. -FLUTTER_ENGINE_CLANG_PATH = $(@D)/buildtools/linux-x64/clang +FLUTTER_ENGINE_CLANG_PATH = $(@D)/flutter/buildtools/linux-x64/clang FLUTTER_ENGINE_CONF_OPTS = \ --clang \ @@ -126,7 +126,7 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) FLUTTER_ENGINE_DEPENDENCIES += libgles -FLUTTER_ENGINE_CONF_OPTS += --enable-impeller-opengles +FLUTTER_ENGINE_CONF_OPTS += --enable-impeller-3d endif ifeq ($(BR2_PACKAGE_LIBGLFW),y) @@ -153,7 +153,7 @@ FLUTTER_ENGINE_DEPENDENCIES += libxcb else define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP $(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \ - $(@D)/build_overrides/vulkan_headers.gni + $(@D)/flutter/build_overrides/vulkan_headers.gni $(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \ $(@D)/build/config/BUILDCONFIG.gn @@ -166,7 +166,7 @@ FLUTTER_ENGINE_DEPENDENCIES += wayland else define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP $(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \ - $(@D)/build_overrides/vulkan_headers.gni + $(@D)/flutter/build_overrides/vulkan_headers.gni $(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \ $(@D)/build/config/BUILDCONFIG.gn diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 4e3e29582f02..88d9193608af 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" -source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-go-router-example/Config.in" source "package/flutter-packages/flutter-image-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/Config.in b/package/flutter-packages/flutter-dynamic-layouts-example/Config.in deleted file mode 100644 index a3f66307959f..000000000000 --- a/package/flutter-packages/flutter-dynamic-layouts-example/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE - bool "flutter dynamic layouts example" - help - This package provides support for multi sized tiles and - different layouts. Currently the layouts that are implemented - in this package are Stagger and Wrap. - - https://github.com/flutter/packages/tree/main/packages/dynamic_layouts/example diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash deleted file mode 120000 index 879f2adb39ee..000000000000 --- a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash +++ /dev/null @@ -1 +0,0 @@ -../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk deleted file mode 100644 index aefcf3f62c9d..000000000000 --- a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# flutter-dynamic-layouts-example -# -################################################################################ - -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME = example -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/dynamc-layouts-$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) -FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SUBDIR = packages/dynamic_layouts/example - -define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_CONFIGURE_CMDS - cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle -endef - -define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILD_CMDS - cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ - $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ - package:$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/main.dart && \ - $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ - --deterministic \ - --obfuscate \ - --snapshot_kind=app-aot-elf \ - --elf=libapp.so \ - .dart_tool/flutter_build/*/app.dill -endef - -define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_TARGET_CMDS - mkdir -p $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/{data,lib} - cp -dprf $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ - - $(INSTALL) -D -m 0755 $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/libapp.so \ - $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/libapp.so - - ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ - $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ - - ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/ - $(RM) $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin - touch $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin -endef - -$(eval $(generic-package)) diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash index f266c497e40c..1fbe60139667 100644 --- a/package/flutter-packages/flutter-packages.hash +++ b/package/flutter-packages/flutter-packages.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e1e19713ac74b6e00a6f5ec516e8ccda5e5ba1fc8b249d40abcfe4cb50dff87 flutter-packages-ab1630b9b9bd1130b4d5d1ac18a588b690fd0fa3.tar.gz +sha256 388ec45142ddfab711aa82958c82657b8c2238deb6c131cec94a5a993ba4c760 flutter-packages-8af79fbca12699248e96b50b4705da74396cd6a3.tar.gz sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk index 6b1a4371e8f0..1a1913043b06 100644 --- a/package/flutter-packages/flutter-packages.mk +++ b/package/flutter-packages/flutter-packages.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PACKAGES_VERSION = ab1630b9b9bd1130b4d5d1ac18a588b690fd0fa3 +FLUTTER_PACKAGES_VERSION = 8af79fbca12699248e96b50b4705da74396cd6a3 FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION)) FLUTTER_PACKAGES_LICENSE = BSD-3-Clause FLUTTER_PACKAGES_LICENSE_FILES = LICENSE diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash index 135a0deb32e3..6a7352474579 100644 --- a/package/flutter-pi/flutter-pi.hash +++ b/package/flutter-pi/flutter-pi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7ce5c8d960735923f6897dd9852b89c8010a01b9a29f4f6bbbf7c016dac623c flutter-pi-783db32ec6441b878783bfa241777d3bfe6b35e2-git4.tar.gz +sha256 c3c7df5712cd7c45539b325b0d8d58d0942b08a6f66c55e3f53aa5225cbe86af flutter-pi-37bd9773c1938e5f76208bc4e8632fdbbb4190ff-git4.tar.gz sha256 b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70 LICENSE diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index ee54a2bf4ee1..fad1da32159d 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PI_VERSION = 783db32ec6441b878783bfa241777d3bfe6b35e2 +FLUTTER_PI_VERSION = 37bd9773c1938e5f76208bc4e8632fdbbb4190ff FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git FLUTTER_PI_SITE_METHOD = git FLUTTER_PI_LICENSE = MIT @@ -33,7 +33,8 @@ FLUTTER_PI_CONF_OPTS = \ -DTRY_ENABLE_VULKAN=OFF \ -DVULKAN_DEBUG="OFF" \ -DUSE_LEGACY_KMS=OFF \ - -DWARN_MISSING_FIELD_INITIALIZERS=OFF + -DWARN_MISSING_FIELD_INITIALIZERS=OFF \ + -DBUILD_SENTRY_PLUGIN=OFF ifeq ($(BR2_ENABLE_LTO),y) FLUTTER_PI_CONF_OPTS += -DLTO=ON diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index b697b9cc9005..4f3622e725c5 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6590607e7f2fb23bcc7e0a2d6aac292f9208cbf12a40862c281058c758604fb3 flutter_linux_3.19.5-stable.tar.xz +sha256 d52a5d12f17d8bcf868d1ccc01fe0f7ffb05b53d9628aa21b07a18f9d33621f2 flutter_linux_3.24.0-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 321c08680fd9..26415551bc72 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.19.5 +FLUTTER_SDK_BIN_VERSION = 3.24.0 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause @@ -68,11 +68,11 @@ HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false endif # The Order matters.Taken from: -# https://github.com/meta-flutter/meta-flutter/blob/kirkstone/classes/flutter-app.inc +# https://github.com/meta-flutter/meta-flutter/blob/scarthgap/conf/include/common.inc HOST_FLUTTER_SDK_BIN_DART_ARGS = \ --verbose \ --disable-analytics \ - --disable-dart-dev $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/linux-x64/frontend_server.dart.snapshot \ + --disable-dart-dev $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/linux-x64/frontend_server_aot.dart.snapshot \ --sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \ --target=flutter \ --no-print-incremental-dependencies \ @@ -85,7 +85,7 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \ --target-os linux \ --packages .dart_tool/package_config.json \ --output-dill .dart_tool/flutter_build/*/app.dill \ - --depfile .dart_tool/flutter_build/*/kernel_snapshot.d + --depfile .dart_tool/flutter_build/*/kernel_snapshot_program.d # Helper wrapper to run flutter when building flutter applications. HOST_FLUTTER_SDK_BIN_FLUTTER = \ @@ -95,7 +95,7 @@ HOST_FLUTTER_SDK_BIN_FLUTTER = \ # Helper wrapper to run dart when building flutter applications. HOST_FLUTTER_SDK_BIN_DART_BIN = \ $(HOST_FLUTTER_SDK_BIN_ENV) \ - $(HOST_FLUTTER_SDK_BIN_DART_SDK)/bin/dart \ + $(HOST_FLUTTER_SDK_BIN_DART_SDK)/bin/dartaotruntime \ $(HOST_FLUTTER_SDK_BIN_DART_ARGS) $(eval $(host-generic-package)) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 90d78dd98931..aff52ccb6e7e 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 62ca45531814109b5d6cef0cf2fd17db92c32a30dd23012976e768c685534814 fmt-11.0.1.zip +sha256 40fc58bebcf38c759e11a7bd8fdc163507d2423ef5058bba7f26280c5b9c5465 fmt-11.0.2.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index d33b5b1bff6c..113652e91160 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 11.0.1 +FMT_VERSION = 11.0.2 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 779306bc2ec1..7849cfd9f221 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5SCRIPT - select BR2_PACKAGE_QT5BASE_GUI + depends on (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE if BR2_PACKAGE_QT6 help Qt implementation of the Django template framework diff --git a/package/grantlee/grantlee.hash b/package/grantlee/grantlee.hash index 6508aa70cceb..6ff509f0dd01 100644 --- a/package/grantlee/grantlee.hash +++ b/package/grantlee/grantlee.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a grantlee-5.2.0.tar.gz +sha256 ba288ae9ed37ec0c3622ceb40ae1f7e1e6b2ea89216ad8587f0863d64be24f06 grantlee-5.3.1.tar.gz # Hash for license file -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 4c3b163159fe524dc992489c5bc52aaf0231b5ff41fb6234adb7f10373da24c4 COPYING.LIB diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 7079679ca42c..9e786645590b 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -4,11 +4,17 @@ # ################################################################################ -GRANTLEE_VERSION = 5.2.0 +GRANTLEE_VERSION = 5.3.1 GRANTLEE_SITE = $(call github,steveire,grantlee,v$(GRANTLEE_VERSION)) GRANTLEE_INSTALL_STAGING = YES GRANTLEE_LICENSE = LGPL-2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB -GRANTLEE_DEPENDENCIES = qt5base qt5script + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +GRANTLEE_DEPENDENCIES += qt5base qt5script +else ifeq ($(BR2_PACKAGE_QT6BASE),y) +GRANTLEE_DEPENDENCIES += qt6base qt6declarative +GRANTLEE_CONF_OPTS += -DGRANTLEE_BUILD_WITH_QT6=ON +endif $(eval $(cmake-package)) diff --git a/package/libgpiod2/libgpiod2.hash b/package/libgpiod2/libgpiod2.hash index b5488496b24d..3b498f0eb94b 100644 --- a/package/libgpiod2/libgpiod2.hash +++ b/package/libgpiod2/libgpiod2.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 fa4024a080121c958502f9a46a5bda44bea85e7a4dd7fcb3dead463b6fc4261c libgpiod-2.1.tar.xz +sha256 2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58 libgpiod-2.1.3.tar.xz # Hash for license file -sha256 eb17a56966db5d986bec449ee44ed61f01f9e3fafa952e527db67a8f9594fd11 COPYING +sha256 f646ad5159efb51c1130a4b43c31f0759750b1e254d2acf510f368ee2e2085c3 COPYING diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk index 856eb9bd14d8..142289cb3a71 100644 --- a/package/libgpiod2/libgpiod2.mk +++ b/package/libgpiod2/libgpiod2.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD2_VERSION = 2.1 +LIBGPIOD2_VERSION = 2.1.3 LIBGPIOD2_SOURCE = libgpiod-$(LIBGPIOD2_VERSION).tar.xz LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD2_LICENSE = LGPL-2.1+ diff --git a/package/libjcat/libjcat.mk b/package/libjcat/libjcat.mk index e13e5dbfb743..c365c1914b87 100644 --- a/package/libjcat/libjcat.mk +++ b/package/libjcat/libjcat.mk @@ -10,7 +10,9 @@ LIBJCAT_SOURCE = libjcat-$(LIBJCAT_VERSION).tar.xz LIBJCAT_LICENSE = LGPL-2.1+ LIBJCAT_LICENSE_FILES = LICENSE LIBJCAT_INSTALL_STAGING = YES -LIBJCAT_DEPENDENCIES = host-pkgconf json-glib libglib2 +LIBJCAT_DEPENDENCIES = host-pkgconf json-glib libglib2 $(TARGET_NLS_DEPENDENCIES) + +LIBJCAT_LDFLAGS = $(TARGET_NLS_LIBS) LIBJCAT_CONF_OPTS = \ -Dgtkdoc=false \ diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index ae82e7eaa84c..1370b6ad0d83 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_102_1_RTM/src/SHA256SUMS -sha256 54982d3587e41579c94f2036ba084438b073f8456bbd873b7a942c057e9737cc nss-3.102.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_103_RTM/src/SHA256SUMS +sha256 7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962 nss-3.103.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 93fc1cb543e2..4c620a604b9e 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.102.1 +LIBNSS_VERSION = 3.103 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist diff --git a/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch new file mode 100644 index 000000000000..771ee838327c --- /dev/null +++ b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch @@ -0,0 +1,33 @@ +From fbde1593948ae95f287b2167d0bec5b27948cc01 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Aug 2024 17:04:55 +0200 +Subject: [PATCH] Export all symbols of mjpg_streamer binary + +Fixes runtime error with stripped binary + + dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help + +Source: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html + +Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/401 + +Signed-off-by: Bernd Kuhls +--- + mjpg-streamer-experimental/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mjpg-streamer-experimental/CMakeLists.txt b/mjpg-streamer-experimental/CMakeLists.txt +index cf26620..3ff12cd 100644 +--- a/mjpg-streamer-experimental/CMakeLists.txt ++++ b/mjpg-streamer-experimental/CMakeLists.txt +@@ -92,6 +92,7 @@ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(mjpg_streamer mjpg_streamer.c + utils.c) + ++set_property(TARGET mjpg_streamer PROPERTY ENABLE_EXPORTS ON) + target_link_libraries(mjpg_streamer pthread dl) + install(TARGETS mjpg_streamer DESTINATION bin) + +-- +2.39.2 + diff --git a/package/python-tomli-w/Config.in b/package/python-tomli-w/Config.in new file mode 100644 index 000000000000..83fe937ebaab --- /dev/null +++ b/package/python-tomli-w/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TOMLI_W + bool "python-tomli-w" + help + A lil' TOML writer. + + https://github.com/hukkin/tomli-w diff --git a/package/python-tomli-w/python-tomli-w.hash b/package/python-tomli-w/python-tomli-w.hash new file mode 100644 index 000000000000..778c22583a5f --- /dev/null +++ b/package/python-tomli-w/python-tomli-w.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli-w/json +md5 2c050134d4842b449ec4129c97d51e62 tomli_w-1.0.0.tar.gz +sha256 f463434305e0336248cac9c2dc8076b707d8a12d019dd349f5c1e382dd1ae1b9 tomli_w-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli-w/python-tomli-w.mk b/package/python-tomli-w/python-tomli-w.mk new file mode 100644 index 000000000000..d5d7ab9f2cd9 --- /dev/null +++ b/package/python-tomli-w/python-tomli-w.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tomli-w +# +################################################################################ + +PYTHON_TOMLI_W_VERSION = 1.0.0 +PYTHON_TOMLI_W_SOURCE = tomli_w-$(PYTHON_TOMLI_W_VERSION).tar.gz +PYTHON_TOMLI_W_SITE = https://files.pythonhosted.org/packages/49/05/6bf21838623186b91aedbda06248ad18f03487dc56fbc20e4db384abde6c +PYTHON_TOMLI_W_SETUP_TYPE = flit +PYTHON_TOMLI_W_LICENSE = MIT +PYTHON_TOMLI_W_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch b/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch new file mode 100644 index 000000000000..c6a6b3dce3f2 --- /dev/null +++ b/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch @@ -0,0 +1,47 @@ +From 94c2e5c6be23c6323f24deacdad5f98fb9f0b1c2 Mon Sep 17 00:00:00 2001 +From: Andreas Arnez +Date: Wed, 15 May 2024 14:32:42 +0200 +Subject: [PATCH] Fix uninitialized `err' in handle_extension() + +In handle_extension(), in the case of a second return from SCHEDSETJMP the +variable `err' would be used uninitialized. Fix this by avoiding any +access to `err' in this case. + +Signed-off-by: Andreas Arnez +Signed-off-by: Waldemar Brodkorb +Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=94c2e5c6be23c6323f24deacdad5f98fb9f0b1c2 +--- + coregrind/m_scheduler/scheduler.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c +index fc8cf7c9c..29751bb28 100644 +--- a/coregrind/m_scheduler/scheduler.c ++++ b/coregrind/m_scheduler/scheduler.c +@@ -1233,7 +1233,10 @@ static void handle_extension(ThreadId tid) + SCHEDSETJMP(tid, jumped, err = VG_(client_extension)(tid)); + vg_assert(VG_(is_running_thread)(tid)); + +- if (err != ExtErr_OK) { ++ if (jumped != (UWord)0) { ++ block_signals(); ++ VG_(poll_signals)(tid); ++ } else if (err != ExtErr_OK) { + ThreadState* tst = VG_(get_ThreadState)(tid); + Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; + switch (err) { +@@ -1244,11 +1247,6 @@ static void handle_extension(ThreadId tid) + VG_(core_panic)("scheduler: bad return code from extension"); + } + } +- +- if (jumped != (UWord)0) { +- block_signals(); +- VG_(poll_signals)(tid); +- } + } + + /* tid just requested a jump to the noredir version of its current +-- +2.39.2 + diff --git a/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch b/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch new file mode 100644 index 000000000000..006e24096e98 --- /dev/null +++ b/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch @@ -0,0 +1,33 @@ +From 16249b21456d681b5d98400287b8dbd926050c75 Mon Sep 17 00:00:00 2001 +From: Andreas Arnez +Date: Wed, 15 May 2024 14:32:42 +0200 +Subject: [PATCH] Avoid use of guest_IP_AT_SYSCALL in handle_extension() + +The guest state field guest_IP_AT_SYSCALL is referenced in +handle_extension(), even though it may not be defined by all +architectures. Avoid its use altogether. + +Signed-off-by: Andreas Arnez +Signed-off-by: Waldemar Brodkorb +Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=16249b21456d681b5d98400287b8dbd926050c75 +--- + coregrind/m_scheduler/scheduler.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c +index 29751bb28..cc8d070b7 100644 +--- a/coregrind/m_scheduler/scheduler.c ++++ b/coregrind/m_scheduler/scheduler.c +@@ -1237,8 +1237,7 @@ static void handle_extension(ThreadId tid) + block_signals(); + VG_(poll_signals)(tid); + } else if (err != ExtErr_OK) { +- ThreadState* tst = VG_(get_ThreadState)(tid); +- Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; ++ Addr addr = VG_(get_IP)(tid); + switch (err) { + case ExtErr_Illop: + VG_(synth_sigill)(tid, addr); +-- +2.39.2 + diff --git a/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch new file mode 100644 index 000000000000..64972c4f570c --- /dev/null +++ b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch @@ -0,0 +1,70 @@ +From 2ccefd4aff98cf355c7d13b3f92bb4d390dfa522 Mon Sep 17 00:00:00 2001 +From: Tino Reichardt +Date: Sun, 4 Aug 2024 11:58:13 +0200 +Subject: [PATCH] ZTS: small fix for SEEK_DATA/SEEK_HOLE tests + +Some libc's like uClibc lag the proper definition of SEEK_DATA +and SEEK_HOLE. Since we have only two files in ZTS which use +these definitons, let's define them by hand: + +``` +#ifndef SEEK_DATA +#define SEEK_DATA 3 +#endif +#ifndef SEEK_HOLE +#define SEEK_HOLE 4 +#endif +``` + +There should be no failures, because: +- FreeBSD has support for SEEK_DATA/SEEK_HOLE since FreeBSD 8 +- Linux has it since Linux 3.1 +- the libc will submit the parameters unchanged to the kernel + +Signed-off-by: Tino Reichardt +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/commit/bd949b10bed3d99e3b40249d9c8d74a0b4304774 +--- + tests/zfs-tests/cmd/mmap_seek.c | 10 ++++++++++ + tests/zfs-tests/tests/functional/cp_files/seekflood.c | 7 +++++++ + 2 files changed, 17 insertions(+) + +diff --git a/tests/zfs-tests/cmd/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek.c +index 7be92d109565..2d250554a13f 100644 +--- a/tests/zfs-tests/cmd/mmap_seek.c ++++ b/tests/zfs-tests/cmd/mmap_seek.c +@@ -35,6 +35,16 @@ + #include + #endif + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#ifndef SEEK_HOLE ++#define SEEK_HOLE 4 ++#endif ++#endif ++ + static void + seek_data(int fd, off_t offset, off_t expected) + { +diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +index 02c2c8e6eca5..f832db85970d 100644 +--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c ++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +@@ -36,6 +36,13 @@ + #include + #include + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#endif ++ + #define DATASIZE (4096) + char data[DATASIZE]; + diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch deleted file mode 100644 index f47c615d1099..000000000000 --- a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= - -Date: Sat, 11 May 2024 22:40:12 +0200 -Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case -cp_files if SEEK_DATA is not defined. - -Signed-off-by: José Luis Salvador Rufo -Upstream: https://github.com/openzfs/zfs/pull/16169 ---- - config/user-unistd.m4 | 24 ++++++++++++++++++++++++ - config/user.m4 | 1 + - config/zfs-build.m4 | 1 + - tests/test-runner/bin/zts-report.py.in | 1 + - tests/zfs-tests/Makefile.am | 2 ++ - tests/zfs-tests/cmd/Makefile.am | 6 +++++- - tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- - 7 files changed, 43 insertions(+), 6 deletions(-) - create mode 100644 config/user-unistd.m4 - -diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 -new file mode 100644 -index 000000000..302bc0bde ---- /dev/null -+++ b/config/user-unistd.m4 -@@ -0,0 +1,24 @@ -+dnl # -+dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ -+ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) -+ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ #ifndef _GNU_SOURCE -+ #define _GNU_SOURCE -+ #endif -+ #include -+ #if defined(SEEK_DATA) -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], [ -+ user_unistd_seek_data=yes -+ AC_MSG_RESULT([yes]) -+ ], [ -+ user_unistd_seek_data=no -+ AC_MSG_RESULT([no]) -+ ]) -+]) -diff --git a/config/user.m4 b/config/user.m4 -index 6ec27a5b2..2326a44be 100644 ---- a/config/user.m4 -+++ b/config/user.m4 -@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ - ZFS_AC_CONFIG_USER_LIBAIO - ZFS_AC_CONFIG_USER_LIBATOMIC - ZFS_AC_CONFIG_USER_LIBFETCH -+ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA - ZFS_AC_CONFIG_USER_AIO_H - ZFS_AC_CONFIG_USER_CLOCK_GETTIME - ZFS_AC_CONFIG_USER_PAM -diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 -index bb5a85d81..578692676 100644 ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ - [test "x$qatsrc" != x ]) - AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) - AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) -+ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) - AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) - ]) - -diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in -index ecc50f487..3a00345ed 100755 ---- a/tests/test-runner/bin/zts-report.py.in -+++ b/tests/test-runner/bin/zts-report.py.in -@@ -162,6 +162,7 @@ known = { - ['FAIL', rewind_reason], - 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], - 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], -+ 'cp_files/cp_stress': ['SKIP', 16169], - 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], - 'privilege/setup': ['SKIP', na_reason], - 'refreserv/refreserv_004_pos': ['FAIL', known_reason], -diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am -index 3dd1a6452..8ae790057 100644 ---- a/tests/zfs-tests/Makefile.am -+++ b/tests/zfs-tests/Makefile.am -@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test - %C%_tests_functional_hkdf_hkdf_test_LDADD = \ - libzpool.la - -+if WANT_UNISTD_SEEK_DATA - scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files - scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood -+endif - - if BUILD_LINUX - scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile -diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am -index 23848a82f..69bba3039 100644 ---- a/tests/zfs-tests/cmd/Makefile.am -+++ b/tests/zfs-tests/cmd/Makefile.am -@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec - scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write --scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files - scripts_zfs_tests_bin_PROGRAMS += %D%/ctime - scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update - scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write -@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test - scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket - - -+if WANT_UNISTD_SEEK_DATA -+scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files -+endif -+ -+ - scripts_zfs_tests_bin_PROGRAMS += %D%/badsend - %C%_badsend_LDADD = \ - libzfs_core.la \ -diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am -index cc66d762f..1e9f06a7e 100644 ---- a/tests/zfs-tests/tests/Makefile.am -+++ b/tests/zfs-tests/tests/Makefile.am -@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/compression/l2arc_encrypted.ksh \ - functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ - functional/compression/setup.ksh \ -- functional/cp_files/cleanup.ksh \ -- functional/cp_files/cp_files_001_pos.ksh \ -- functional/cp_files/cp_files_002_pos.ksh \ -- functional/cp_files/cp_stress.ksh \ -- functional/cp_files/setup.ksh \ - functional/crtime/cleanup.ksh \ - functional/crtime/crtime_001_pos.ksh \ - functional/crtime/setup.ksh \ -@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/idmap_mount/idmap_mount_003.ksh \ - functional/idmap_mount/idmap_mount_004.ksh \ - functional/idmap_mount/idmap_mount_005.ksh -+ -+if WANT_UNISTD_SEEK_DATA -+nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ -+ functional/cp_files/cleanup.ksh \ -+ functional/cp_files/cp_files_001_pos.ksh \ -+ functional/cp_files/cp_files_002_pos.ksh \ -+ functional/cp_files/cp_stress.ksh \ -+ functional/cp_files/setup.ksh -+endif --- -2.45.2 - diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 9c8d4cec850c..9598aed992b1 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ # From https://github.com/openzfs/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.sha256.asc -sha256 9790905f7683d41759418e1ef3432828c31116654ff040e91356ff1c21c31ec0 zfs-2.2.4.tar.gz +sha256 2388cf6f29cd75e87d6d05e4858a09d419c4f883a658d51ef57796121cd08897 zfs-2.2.5.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index e0fa39267049..549f8641b92d 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.2.4 +ZFS_VERSION = 2.2.5 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL @@ -12,9 +12,6 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch -ZFS_AUTORECONF = YES - ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux # sysvinit installs only a commented-out modules-load.d/ config file diff --git a/support/testing/tests/graphics_base.py b/support/testing/tests/graphics_base.py new file mode 100644 index 000000000000..15a4c00bb22f --- /dev/null +++ b/support/testing/tests/graphics_base.py @@ -0,0 +1,39 @@ +class GraphicsBase: + def get_n_fb_crc(self, *, count=10, uniq=False, timeout=-1): + """ + Return count DRM CRC from the framebuffer. If uniq is True, + only unique CRCs are returned (which may be less than the + requested cont). + Returns a possibly empty list of integers. + Set timeout to -1 for no timeout, or to a positive number for + a timeout of that many seconds. + """ + # DRM CRCs are exposed through a sysfs pseudo file + try: + self.debugfs_mounted + except AttributeError: + # Note: some init system (e.g. systemd) may have this already + # mounted, so check beforehand + self.assertRunOk("mountpoint /sys/kernel/debug/ || mount -t debugfs none /sys/kernel/debug/") + self.debugfs_mounted = True + + # The first column is the frame number, the second column is the + # CRC measure. We use "head" to get the needed CRC count. + disp_crc_path = "/sys/kernel/debug/dri/0/crtc-0/crc/data" + cmd = f"head -{count} {disp_crc_path}" + + # The DRM CRC sysfs pseudo file lines are terminated by '\n' + # and '\0'. We remove the '\0' to have a text-only output. + cmd += " | tr -d '\\000'" + + # Finally, we drop the frame counter, and keep only the second + # column (CRC values) + cmd += " | cut -f 2 -d ' '" + + if uniq: + cmd += " | sort -u" + + output, exit_code = self.emulator.run(cmd, timeout=timeout) + self.assertTrue(exit_code == 0, f"'{cmd}' failed with exit code {exit_code}") + + return [int(crc, 16) for crc in output] diff --git a/support/testing/tests/package/test_flutter.py b/support/testing/tests/package/test_flutter.py index 3a150a69e1b7..08aa497417c6 100644 --- a/support/testing/tests/package/test_flutter.py +++ b/support/testing/tests/package/test_flutter.py @@ -1,8 +1,11 @@ import os +import time import infra.basetest +from ..graphics_base import GraphicsBase -class TestFlutter(infra.basetest.BRTest): + +class TestFlutter(infra.basetest.BRTest, GraphicsBase): config = f""" BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y @@ -40,7 +43,7 @@ def test_run(self): self.emulator.boot( arch="aarch64", kernel=kern, - kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + kernel_cmdline=["root=/dev/vda console=ttyAMA0 vt.global_cursor_default=0"], options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", @@ -49,7 +52,27 @@ def test_run(self): "-vnc", "none", "-drive", f"file={img},if=virtio,format=raw"]) self.emulator.login() - cmd = "systemctl is-active flutter-markdown-example" - output, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "active") + + # Get the CRC from the current ramebuffer + empty_crc = self.get_n_fb_crc(count=1)[0] + + # Start the example App. It can take a bit of time to start, + # so lets try a few times. 600 samples should cover about 10s + # @60Hz (although, the rendering could be much slower on slow + # machines) + self.assertRunOk("systemctl start flutter-markdown-example", timeout=10) + for i in range(600): + gallery_crc = self.get_n_fb_crc(count=1)[0] + if gallery_crc != empty_crc: + break + time.sleep(1) + self.assertNotEqual(gallery_crc, empty_crc, "gallery app did not render anything on screen") + + # Stop the application, and check it restored the framebuffer content + self.assertRunOk("systemctl stop flutter-markdown-example", timeout=10) + for i in range(600): + gallery_crc = self.get_n_fb_crc(count=1)[0] + if gallery_crc == empty_crc: + break + time.sleep(1) + self.assertEqual(gallery_crc, empty_crc, "gallery app did not stop rendering") diff --git a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service deleted file mode 120000 index 83e731ba2dff..000000000000 --- a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service +++ /dev/null @@ -1 +0,0 @@ -../../../../usr/lib/systemd/system/flutter-markdown-example.service \ No newline at end of file diff --git a/support/testing/tests/package/test_vorbis_tools.py b/support/testing/tests/package/test_vorbis_tools.py new file mode 100644 index 000000000000..edf186f31d85 --- /dev/null +++ b/support/testing/tests/package/test_vorbis_tools.py @@ -0,0 +1,20 @@ +from tests.package.test_audio_codec_base import TestAudioCodecBase + + +class TestVorbisTools(TestAudioCodecBase): + __test__ = True + config = TestAudioCodecBase.config + \ + """ + BR2_PACKAGE_VORBIS_TOOLS=y + """ + encoded_file = "encoded.ogg" + + def encode_test(self, input_filename): + cmd = "oggenc" + cmd += f" -o {self.encoded_file} {input_filename}" + self.assertRunOk(cmd) + + def decode_test(self, output_filename): + cmd = "oggdec" + cmd += f" -o {output_filename} {self.encoded_file}" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_weston.py b/support/testing/tests/package/test_weston.py index df1b7a41358b..f37a73565fa9 100644 --- a/support/testing/tests/package/test_weston.py +++ b/support/testing/tests/package/test_weston.py @@ -2,9 +2,10 @@ import time import infra.basetest +from ..graphics_base import GraphicsBase -class TestWeston(infra.basetest.BRTest): +class TestWeston(infra.basetest.BRTest, GraphicsBase): config = \ """ BR2_aarch64=y @@ -36,31 +37,6 @@ class TestWeston(infra.basetest.BRTest): infra.filepath("tests/package/test_weston/linux-vkms.fragment") ) - def gen_read_disp_crcs_cmd(self, count=1): - # DRM CRCs are exposed through a sysfs pseudo file, one measure - # per line. The first column is the frame number, the second - # column is the CRC measure. We use "head" to get the needed - # CRC count. - disp_crc_path = "/sys/kernel/debug/dri/0/crtc-0/crc/data" - cmd = f"head -{count} {disp_crc_path}" - - # The DRM CRC sysfs pseudo file lines are terminated by '\n' - # and '\0'. We remove the '\0' to have a text-only output. - cmd += " | tr -d '\\000'" - - # Finally, we drop the frame counter, and keep only the second - # column (CRC values) - cmd += " | cut -f 2 -d ' '" - - return cmd - - def gen_count_unique_disp_crcs_cmd(self, count=10): - # We get the command generating one CRC per line... - cmd = self.gen_read_disp_crcs_cmd(count) - # ...then count the number of unique values - cmd += " | uniq | wc -l" - return cmd - def start_weston(self): self.assertRunOk("export XDG_RUNTIME_DIR=/tmp") @@ -106,25 +82,14 @@ def test_run(self): # Check a simple info client can communicate with the compositor self.assertRunOk("wayland-info", timeout=10) - # This test will use the Kernel VKMS DRM Display CRC support, - # which is exposed in debugfs. See: - # https://docs.kernel.org/gpu/drm-uapi.html#display-crc-support - self.assertRunOk("mount -t debugfs none /sys/kernel/debug/") - # We get 10 consecutive DRM frame CRCs and count how many # unique CRCs we have. Since weston is supposed to run idle, # we should have 10 times the same display CRC. - cmd = self.gen_count_unique_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - self.assertEqual(int(output[0]), 1) + self.assertTrue(len(self.get_n_fb_crc(uniq=True)) == 1) # We save the CRC value of an empty weston desktop for # later... - cmd = self.gen_read_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - weston_desktop_crc = int(output[0], 16) + weston_desktop_crc = self.get_n_fb_crc(count=1)[0] # We start the weston-simple-egl in background... Every # rendered frame is supposed to be different (as the triangle @@ -138,10 +103,8 @@ def test_run(self): # display something, we are now supposed to measure a # different display CRC than the one we measured when the # desktop was empty. - cmd = self.gen_read_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - self.assertNotEqual(int(output[0], 16), weston_desktop_crc) + crc = self.get_n_fb_crc(count=1)[0] + self.assertNotEqual(crc, weston_desktop_crc) # While weston-simple-egl is running, we check the VKMS DRM # CRCs are now changing. We get many CRCs, one per display @@ -152,10 +115,8 @@ def test_run(self): # remain very permissive to slow emulation situations. # Increase timeout, as the command is expected to run about 5s, # which is the default timeout. - cmd = self.gen_count_unique_disp_crcs_cmd(300) - output, exit_code = self.emulator.run(cmd, timeout=10) - self.assertEqual(exit_code, 0) - self.assertGreaterEqual(int(output[0]), 5) + crcs = self.get_n_fb_crc(count=300, timeout=10) + self.assertGreaterEqual(len(crcs), 5) # We stop weston-simple-egl, and sleep a bit to let Weston do # its cleanup and desktop repaint refresh... @@ -165,10 +126,8 @@ def test_run(self): # After we stopped the application, we should have the initial # weston desktop background. The CRC we measure now should be # the same as the one we saved earlier. - cmd = self.gen_read_disp_crcs_cmd() - output, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - self.assertEqual(int(output[0], 16), weston_desktop_crc) + crc = self.get_n_fb_crc(count=1)[0] + self.assertEqual(crc, weston_desktop_crc) self.stop_weston()