diff --git a/.checkpackageignore b/.checkpackageignore index 5a427fe0f1..8e24c73525 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -475,9 +475,9 @@ package/ftop/0001-overflow.patch lib_patch.Upstream package/fwts/0001-build-do-not-use-Werror.patch lib_patch.Upstream package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch lib_patch.Upstream package/fxload/0001-fix-static-build.patch lib_patch.Upstream -package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/13.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/14.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream +package/gcc/15.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream @@ -521,8 +521,7 @@ package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_ package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream -package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream -package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream +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 @@ -740,8 +739,6 @@ package/lirc-tools/0002-configure-add-disable-doc-option.patch lib_patch.Upstrea package/lirc-tools/S25lircd lib_sysv.Indent lib_sysv.Variables package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch lib_patch.Upstream package/lldpd/S60lldpd Shellcheck lib_sysv.Indent lib_sysv.Variables -package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch lib_patch.Upstream -package/llvm-project/libclc/0001-support-out-of-tree-build.patch lib_patch.Upstream package/lm-sensors/0001-static-build.patch lib_patch.Upstream package/lm-sensors/0002-no-host-ldconfig.patch lib_patch.Upstream package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch lib_patch.Upstream @@ -795,7 +792,6 @@ package/memstat/0001-PATH_MAX.patch lib_patch.Upstream package/mender-connect/S43mender-connect Shellcheck package/menu-cache/0001-Support-gcc10-compilation.patch lib_patch.Upstream package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch lib_patch.Upstream -package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch lib_patch.Upstream package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch lib_patch.Upstream package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch lib_patch.Upstream package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 54792bc22f..7cb3d945a1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,8 +144,36 @@ endif ############################################################################### +comment "Legacy options removed in 2025.08" + +config BR2_PACKAGE_GPSD_OCEANSERVER + bool "gpsd OceanServer removed upstream" + select BR2_LEGACY + help + Support for OceanServer has been removed upstream in gpsd + v3.26. + +config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM + bool "mesa3d OSMesa (Gallium) library support removed" + select BR2_LEGACY + help + Mesa3d removed the OSMesa (Off-Screen) interface library. + +config BR2_PACKAGE_ALSA_LIB_ALISP + bool "alsa-lib alisp support removed" + select BR2_LEGACY + help + Support for alisp was removed from alsa-lib v1.12.14. + comment "Legacy options removed in 2025.05" +config BR2_GCC_VERSION_12_X + bool "gcc 12.x support removed" + select BR2_LEGACY + help + Support for building a toolchain based on GCC 12.x has been + removed, chose a newer GCC version instead. + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST bool "mesa Gallium swrast driver was replaced by softpipe" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a7bb3bd834..c1265c1b4e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -911,6 +911,11 @@ F: configs/acmesystems_acqua_a5_512mb_defconfig N: Eero Aaltonen F: package/docopt-cpp/ +N: El Mehdi YOUNES +F: package/opencl-headers/ +F: package/opencl-icd-loader/ +F: support/testing/tests/package/test_mesa3d.py + N: Eloi Bail F: package/bayer2rgb-neon/ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ @@ -1115,8 +1120,6 @@ N: Fiona Klute F: package/*/S* F: package/panel-mipi-dbi-firmware/ F: package/python-aiomqtt/ -F: package/python-dunamai/ -F: package/python-poetry-dynamic-versioning/ F: package/python-pyasynchat/ F: package/python-pyasyncore/ F: support/testing/tests/package/sample_python_networkmanager_goi.py @@ -2288,12 +2291,14 @@ F: package/python-pydantic-settings/ F: package/python-ruamel-yaml-clib/ F: package/python-typing-inspection/ F: package/python-tzlocal/ +F: package/python-sdbus-modemmanager/ F: package/python-waitress/ F: support/testing/tests/package/test_python_django.py F: support/testing/tests/package/test_python_fastapi.py F: support/testing/tests/package/test_python_pydantic.py F: support/testing/tests/package/test_python_pydantic_settings.py F: support/testing/tests/package/test_python_ruamel_yaml.py +F: support/testing/tests/package/test_python_sdbus_modemmanager.py F: support/testing/tests/package/test_python_tzlocal.py F: support/testing/tests/package/test_python_waitress.py F: support/testing/tests/package/sample_python_django.py @@ -2301,6 +2306,7 @@ F: support/testing/tests/package/sample_python_fastapi.py F: support/testing/tests/package/sample_python_pydantic.py F: support/testing/tests/package/sample_python_pydantic_settings.py F: support/testing/tests/package/sample_python_ruamel_yaml.py +F: support/testing/tests/package/sample_python_sdbus_modemmanager.py N: Marek Belisko F: package/libatasmart/ diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 546ba8070e..c5695c1eba 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -518,6 +518,14 @@ config BR2_neoverse_n2 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV9A select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + +comment "armv9.2a cores" +config BR2_cortex_a720 + bool "Cortex-A720 (aka hunter)" + depends on BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV9A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 endchoice config BR2_ARM_ENABLE_NEON @@ -914,6 +922,8 @@ config BR2_GCC_TARGET_CPU # armv9.0a default "cortex-a710" if BR2_cortex_a710 default "neoverse-n2" if BR2_neoverse_n2 + # armv9.2a + default "cortex-a720" if BR2_cortex_a720 config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb diff --git a/board/coolpi/coolpi-4b/extlinux.conf b/board/coolpi/coolpi-4b/extlinux.conf new file mode 100644 index 0000000000..466ab1eed6 --- /dev/null +++ b/board/coolpi/coolpi-4b/extlinux.conf @@ -0,0 +1,4 @@ +label coolpi-4b-buildroot + kernel /Image.gz + devicetree /rk3588s-coolpi-4b.dtb + append root=/dev/mmcblk1p2 rw rootfstype=ext4 earlycon earlyprintk console=ttyS2,1500000n8 rootwait diff --git a/board/coolpi/coolpi-4b/genimage.cfg b/board/coolpi/coolpi-4b/genimage.cfg new file mode 100644 index 0000000000..826d899c95 --- /dev/null +++ b/board/coolpi/coolpi-4b/genimage.cfg @@ -0,0 +1,35 @@ +# SD card image for Cool PI 4b + +image boot.vfat { + vfat { + files = { + "Image.gz", + "rk3588s-coolpi-4b.dtb", + "extlinux" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + partition-table-type = "hybrid" + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-rockchip.bin" + offset = 32K + } + + partition boot { + partition-type = "0xC" + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/coolpi/coolpi-4b/patches/linux-headers/linux-headers.hash b/board/coolpi/coolpi-4b/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/coolpi/coolpi-4b/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/coolpi/coolpi-4b/patches/linux/linux.hash b/board/coolpi/coolpi-4b/patches/linux/linux.hash new file mode 100644 index 0000000000..ae11c54bfd --- /dev/null +++ b/board/coolpi/coolpi-4b/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 de8b97cfeae74c22f832ee4ca2333c157cc978d98baa122f0ee9c01796a2fe43 linux-6.14.10.tar.xz diff --git a/board/coolpi/coolpi-4b/patches/uboot/uboot.hash b/board/coolpi/coolpi-4b/patches/uboot/uboot.hash new file mode 100644 index 0000000000..80ea21b7cb --- /dev/null +++ b/board/coolpi/coolpi-4b/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/coolpi/coolpi-4b/post-image.sh b/board/coolpi/coolpi-4b/post-image.sh new file mode 100755 index 0000000000..65b79e81c8 --- /dev/null +++ b/board/coolpi/coolpi-4b/post-image.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -e + +BOARD_DIR="$(dirname "$0")" +gzip -fk "${BINARIES_DIR}/Image" +install -m 0644 -D "$BOARD_DIR/extlinux.conf" "$BINARIES_DIR/extlinux/extlinux.conf" +support/scripts/genimage.sh -c board/coolpi/coolpi-4b/genimage.cfg diff --git a/board/coolpi/coolpi-4b/readme.txt b/board/coolpi/coolpi-4b/readme.txt new file mode 100644 index 0000000000..7213ab3bae --- /dev/null +++ b/board/coolpi/coolpi-4b/readme.txt @@ -0,0 +1,57 @@ +Cool Pi 4B +============== +https://www.cool-pi.com/product/cp4b/ + +Build: +====== + $ make coolpi_4b_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +output/images/ +├── boot.vfat +├── extlinux +│   └── extlinux.conf +├── Image +├── Image.gz +├── rk3588_bl31_v1.40.elf +├── rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +├── rk3588s-coolpi-4b.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot-rockchip.bin + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Serial console: +--------------- +The Cool Pi 4B has a 40-pin GPIO header. + +The Uart pins are as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Baudrate for this board is 1500000. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. diff --git a/board/raspberrypi/config_cm5io.txt b/board/raspberrypi/config_cm5io.txt new file mode 100644 index 0000000000..b66efef661 --- /dev/null +++ b/board/raspberrypi/config_cm5io.txt @@ -0,0 +1,24 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host + +# Enable UART0 for serial console on ttyAMA0 +dtparam=uart0_console=on diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 7dda631387..31ff424a83 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -20,6 +20,7 @@ These instructions apply to all models of the Raspberry Pi: - the model CM4s (aka Raspberry Pi Compute Module 4s). - the model B5 (aka Raspberry Pi 5). - the model 500 (aka Raspberry Pi 500). + - the model CM5 (aka Raspberry Pi Compute Module 5 and IO Board). How to build it =============== @@ -86,6 +87,10 @@ For model 5 B and 500: $ make raspberrypi5_defconfig +For model CM5 (on IO Board): + + $ make raspberrypicm5io_defconfig + Build the rootfs ---------------- @@ -123,6 +128,8 @@ After building, you should obtain this tree: +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2712d0-rpi-5-b.dtb [1] +-- bcm2712-rpi-500.dtb [1] + +-- bcm2712-rpi-cm5-cm5io [1] + +-- bcm2712-rpi-cm5l-cm5io [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ @@ -197,3 +204,33 @@ for CM4 modules with eMMC memory proceed as following: - power down CM4/IO Board - remove jumper on IO Board header J2 to re-enable eMMC boot - power up CM4/IO Board + +CM5 debug UART +============== + +The debug UART header is not assembled on the Compute Module 5. + + 2.23. Debug UART + + Space is provided for the user to fit a debug UART connector. This + connector provides the same functionality as Raspberry Pi 5. The + connector is a three-pin 1mm pitch JST-SH connector, Part number + BM03B-SRSS-TB. The signals are replicated on the bottom as test points. + + Appendix B: Test Points + + | Reference | X | Y | NAME | + | TP35 | 11 | 37.8 | DEBUG_UART_TX | + | TP36 | 8.5 | 37.1 | DEBUG_UART_RX | + + Debug UART + + TP35 and TP36 are a TX and RX of the debug UART. TP46 should be used as + the ground. It is very useful to have access to these pins during + programming and initial boot. + +See https://datasheets.raspberrypi.com/cm5/cm5-datasheet.pdf. + +The signals are not wired up to 100-pin headers either. And thus, it is +impossible to output early boot traces in the EEPROM firmware without +assembling a JST-SH connector (or using the test points). diff --git a/board/raspberrypicm5io b/board/raspberrypicm5io new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypicm5io @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 22367d5028..b5ce2e3f0c 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -17,7 +17,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" the_ROM_image: { image { - { type=bootimage, file=${BINARIES_DIR}/vpl_gen_fixed.pdi } + { type=bootimage, file=${BINARIES_DIR}/boot.pdi } { type=bootloader, file=${BINARIES_DIR}/plm.elf } { core=psm, file=${BINARIES_DIR}/psmfw.elf } } diff --git a/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch b/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch new file mode 100644 index 0000000000..e9dfee9f97 --- /dev/null +++ b/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch @@ -0,0 +1,127 @@ +From 333678d7b9edc29e8148411d48f70950b1b614c1 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Mon, 2 Jun 2025 11:07:03 +0100 +Subject: [PATCH] include/uapi/linux/xlnx-ai-engine.h: fix + CONFIG_XILINX_AIE leak + +Linux Kconfig options should not be exposed to user space. This patch fixes +a Linux kernel leak of the CONFIG_XILINX_AIE option by moving the changes +implemented by the CONFIG_XILINX_AIE from the uapi header file to the local +Linux kernel header file. + +Upstream: internal AMD jira process +Signed-off-by: Neal Frager +--- + include/linux/xlnx-ai-engine.h | 37 +++++++++++++++++++++++++ + include/uapi/linux/xlnx-ai-engine.h | 42 ----------------------------- + 2 files changed, 37 insertions(+), 42 deletions(-) + +diff --git a/include/linux/xlnx-ai-engine.h b/include/linux/xlnx-ai-engine.h +index 44a1e40ef9b8..10905dc84ae9 100644 +--- a/include/linux/xlnx-ai-engine.h ++++ b/include/linux/xlnx-ai-engine.h +@@ -171,6 +171,13 @@ static inline u32 aie_get_error_category(struct aie_error *err) + return err->category; + } + ++int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); ++int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); ++bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc); ++int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc); ++int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval); ++int aie_load_cert(struct device *dev, unsigned char *elf_addr); ++ + #else + static inline bool aie_partition_is_available(struct aie_partition_req *req) + { +@@ -271,5 +278,35 @@ static inline int aie_part_rscmgr_set_static_range(struct device *dev, + return -EINVAL; + } + ++int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) ++{ ++ return -EINVAL; ++} ++ ++int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) ++{ ++ return -EINVAL; ++} ++ ++bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc) ++{ ++ return false; ++} ++ ++int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc) ++{ ++ return 0; ++} ++ ++int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval) ++{ ++ return -EINVAL; ++} ++ ++int aie_load_cert(struct device *dev, unsigned char *elf_addr) ++{ ++ return -EINVAL; ++} ++ + #endif /* CONFIG_XILINX_AIE */ + #endif +diff --git a/include/uapi/linux/xlnx-ai-engine.h b/include/uapi/linux/xlnx-ai-engine.h +index 424c5f4c4097..1680aed8ad85 100644 +--- a/include/uapi/linux/xlnx-ai-engine.h ++++ b/include/uapi/linux/xlnx-ai-engine.h +@@ -781,47 +781,5 @@ struct aie_rsc_user_stat_array { + */ + #define AIE_UPDATE_SHIMDMA_DMABUF_BD_ADDR_IOCTL _IOW(AIE_IOCTL_BASE, 0x1e, \ + struct aie_dmabuf_bd_args) +-#if IS_ENABLED(CONFIG_XILINX_AIE) +- +-int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); +-int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); +-bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc); +-int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc); +-int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval); +-int aie_load_cert(struct device *dev, unsigned char *elf_addr); +- +-#else /* IS_ENABLED(CONFIG_XILINX_AIE) */ +- +-int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) +-{ +- return -EINVAL; +-} +- +-int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) +-{ +- return -EINVAL; +-} +- +-bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc) +-{ +- return false; +-} +- +-int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc) +-{ +- return 0; +-} +- +-int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval) +-{ +- return -EINVAL; +-} +- +-int aie_load_cert(struct device *dev, unsigned char *elf_addr) +-{ +- return -EINVAL; +-} +- +-#endif /* IS_ENABLED(CONFIG_XILINX_AIE) */ + + #endif +-- +2.25.1 + 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 15cceebb80..2ef3825bb9 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,3 @@ # Locally calculated sha256 a45390c9e1d584a389abd37ee49dce3f8d3b41718b1fd7c977608b5387a38955 xlnx_rebase_v2.10_2024.2.tar.gz +sha256 4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d xlnx_rebase_v2.12_2025.1.tar.gz diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash index a970a878c2..0022390aa6 100644 --- a/board/xilinx/patches/linux/linux.hash +++ b/board/xilinx/patches/linux/linux.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 b726226e8784d92049190f19768d393eccf3ad111c7a2e685bb29cfa1bdf1f70 xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz +sha256 25795c354f30a3358506ab02deeac99e7f79850804c52d6c3d5539fd310f0491 xlnx_rebase_v6.12_LTS_2025.1.tar.gz diff --git a/board/xilinx/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash index de0e6adad1..56ee166378 100644 --- a/board/xilinx/patches/uboot/uboot.hash +++ b/board/xilinx/patches/uboot/uboot.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 f1a86ccdbe60bac89177a24bbfd56fc6e8e67823669f0997de563c3cc0ea4dd1 xlnx_rebase_v2024.01_2024.2.tar.gz +sha256 b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93 xlnx_rebase_v2025.01_2025.1.tar.gz diff --git a/board/zynqmp/kria/patches/uboot/0001-video-zynqmp-add-support-for-reset.patch b/board/zynqmp/kria/patches/uboot/0001-video-zynqmp-add-support-for-reset.patch deleted file mode 100644 index ded030b3b2..0000000000 --- a/board/zynqmp/kria/patches/uboot/0001-video-zynqmp-add-support-for-reset.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Michal Simek -Date: Mon, 9 Dec 2024 12:11:50 +0100 -Subject: [PATCH] video: zynqmp: Add support for reset - -In Kria SOM configuration DP is under reset and access to DP is causing -hang that's why call reset at probe to avoid this situation. - -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/0504474a91a9839828aecd37f8855fd154cdf2e1.1733742708.git.michal.simek@amd.com -Upstream: https://github.com/u-boot/u-boot/commit/8b81010a2fe385524b58bea9116f1b6954c3d2bd ---- - drivers/video/zynqmp/zynqmp_dpsub.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/video/zynqmp/zynqmp_dpsub.c b/drivers/video/zynqmp/zynqmp_dpsub.c -index 76abfeac4433..52af23c3c835 100644 ---- a/drivers/video/zynqmp/zynqmp_dpsub.c -+++ b/drivers/video/zynqmp/zynqmp_dpsub.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -2093,10 +2094,15 @@ static int zynqmp_dpsub_probe(struct udevice *dev) - { - struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct zynqmp_dpsub_priv *priv = dev_get_priv(dev); -+ struct reset_ctl_bulk resets; - struct clk clk; - int ret; - int mode = RGBA8888; - -+ ret = reset_get_bulk(dev, &resets); -+ if (!ret) -+ reset_deassert_bulk(&resets); -+ - ret = clk_get_by_name(dev, "dp_apb_clk", &clk); - if (ret < 0) { - dev_err(dev, "failed to get clock\n"); diff --git a/board/zynqmp/patches/uboot/0001-kbuild-cherry-pick-kbuild-fdtoverlay-changes-from-linux.patch b/board/zynqmp/patches/uboot/0001-kbuild-cherry-pick-kbuild-fdtoverlay-changes-from-linux.patch deleted file mode 100644 index cf7f101af4..0000000000 --- a/board/zynqmp/patches/uboot/0001-kbuild-cherry-pick-kbuild-fdtoverlay-changes-from-linux.patch +++ /dev/null @@ -1,198 +0,0 @@ -From: Prasad Kummari -Date: Fri, 6 Sep 2024 12:38:07 +0530 -Subject: [PATCH] kbuild: cherry-pick kbuild fdtoverlay changes from linux - -Linux commits: -15d16d6dadf6 kbuild: Add generic rule to apply fdtoverlay -44f87191d105 kbuild: parameterize the .o part of suffix-search - -The Linux commit 15d16d6dadf6 adds a generic rule in Makefile.lib -to automatically apply fdtoverlay, so that each platform doesn't -need to include a complex rule. This also automatically appends -DTC_FLAGS_foo_base += -@ to all base files - -The platform's Makefile only needs to have this now: - -foo-dtbs := foo_base.dtb foo_overlay1.dtbo foo_overlay2.dtbo -dtb-y := foo.dtb - -Signed-off-by: Prasad Kummari -Reviewed-by: Tom Rini -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/20240906070808.1045991-2-prasad.kummari@amd.com -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/10de9b5a6a5b53a37600894115685f00d3bbfc2d ---- - arch/arm/dts/Makefile | 57 ++++++++++++++++++++++++++++++++++++++++++ - scripts/Kbuild.include | 4 +++ - scripts/Makefile.build | 1 + - scripts/Makefile.lib | 27 ++++++++++++++++++++ - 4 files changed, 89 insertions(+) - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 48ca62521b8..8b6f65a61a2 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -477,6 +477,63 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ - zynqmp-zc1751-xm017-dc3.dtb \ - zynqmp-zc1751-xm018-dc4.dtb \ - zynqmp-zc1751-xm019-dc5.dtb -+ -+zynqmp-p-a2197-00-revA-x-prc-01-revA-dtbs := zynqmp-p-a2197-00-revA.dtb zynqmp-p-a2197-00-revA-x-prc-01-revA.dtbo -+zynqmp-p-a2197-00-revA-x-prc-02-revA-dtbs := zynqmp-p-a2197-00-revA.dtb zynqmp-p-a2197-00-revA-x-prc-02-revA.dtbo -+zynqmp-p-a2197-00-revA-x-prc-03-revA-dtbs := zynqmp-p-a2197-00-revA.dtb zynqmp-p-a2197-00-revA-x-prc-03-revA.dtbo -+zynqmp-p-a2197-00-revA-x-prc-04-revA-dtbs := zynqmp-p-a2197-00-revA.dtb zynqmp-p-a2197-00-revA-x-prc-04-revA.dtbo -+zynqmp-p-a2197-00-revA-x-prc-05-revA-dtbs := zynqmp-p-a2197-00-revA.dtb zynqmp-p-a2197-00-revA-x-prc-05-revA.dtbo -+ -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-01-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-02-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-03-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-04-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-05-revA.dtb -+ -+zynqmp-sc-vek280-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vek280-revA.dtbo -+zynqmp-sc-vek280-revB-dtbs := zynqmp-sc-revC.dtb zynqmp-sc-vek280-revB.dtbo -+zynqmp-sc-vhk158-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vhk158-revA.dtbo -+zynqmp-sc-vpk120-revB-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vpk120-revB.dtbo -+zynqmp-sc-vpk180-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vpk180-revA.dtbo -+zynqmp-sc-vpk180-revB-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vpk180-revB.dtbo -+zynqmp-sc-vn-p-b2197-00-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vn-p-b2197-00-revA.dtbo -+ -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vek280-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vek280-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vhk158-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vpk120-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vpk180-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vpk180-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vn-p-b2197-00-revA.dtb -+ -+zynqmp-sm-k26-revA-sck-kv-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo -+zynqmp-sm-k26-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo -+zynqmp-smk-k26-revA-sck-kv-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo -+zynqmp-smk-k26-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo -+ -+zynqmp-sm-k26-revA-sck-kr-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -+zynqmp-sm-k26-revA-sck-kr-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo -+zynqmp-smk-k26-revA-sck-kr-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -+zynqmp-smk-k26-revA-sck-kr-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo -+ -+zynqmp-sm-k24-revA-sck-kd-g-revA-dtbs := zynqmp-sm-k24-revA.dtb zynqmp-sck-kd-g-revA.dtbo -+zynqmp-smk-k24-revA-sck-kd-g-revA-dtbs := zynqmp-smk-k24-revA.dtb zynqmp-sck-kd-g-revA.dtbo -+zynqmp-sm-k24-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k24-revA.dtb zynqmp-sck-kv-g-revB.dtbo -+zynqmp-smk-k24-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k24-revA.dtb zynqmp-sck-kv-g-revB.dtbo -+ -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kr-g-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kr-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kr-g-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kr-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kd-g-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kd-g-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kv-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kv-g-revB.dtb -+ - dtb-$(CONFIG_ARCH_VERSAL) += \ - versal-emb-plus-ve2302-revA.dtb \ - versal-mini.dtb \ -diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include -index 62e0207f91b..5daceb26061 100644 ---- a/scripts/Kbuild.include -+++ b/scripts/Kbuild.include -@@ -31,6 +31,10 @@ baseprereq = $(basename $(notdir $<)) - # Escape single quote for use in echo statements - escsq = $(subst $(squote),'\$(squote)',$1) - -+### -+# real prerequisites without phony targets -+real-prereqs = $(filter-out $(PHONY), $^) -+ - ### - # Easy method for doing a status message - kecho := : -diff --git a/scripts/Makefile.build b/scripts/Makefile.build -index 97dd4a64f6e..b3bb8e558d3 100644 ---- a/scripts/Makefile.build -+++ b/scripts/Makefile.build -@@ -293,6 +293,7 @@ $(obj)/%.o: $(src)/%.S FORCE - - targets += $(real-objs-y) $(real-objs-m) $(lib-y) - targets += $(extra-y) $(MAKECMDGOALS) $(always) -+targets += $(real-dtb-y) $(lib-y) $(always-y) - - # Linker scripts preprocessor (.lds.S -> .lds) - # --------------------------------------------------------------------------- -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 16bbc277a9f..b867941816d 100644 ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -47,6 +47,13 @@ obj-m := $(filter-out %/, $(obj-m)) - - subdir-ym := $(sort $(subdir-y) $(subdir-m)) - -+# Expand $(foo-objs) $(foo-y) etc. by replacing their individuals -+suffix-search = $(strip $(foreach s, $3, $($(1:%$(strip $2)=%$s)))) -+# List composite targets that are constructed by combining other targets -+multi-search = $(sort $(foreach m, $1, $(if $(call suffix-search, $m, $2, $3 -), $m))) -+# List primitive targets that are compiled from source files -+real-search = $(foreach m, $1, $(if $(call suffix-search, $m, $2, $3 -), $(call suffix-search, $m, $2, $3), $m)) -+ - # if $(foo-objs) exists, foo.o is a composite object - multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) - multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) -@@ -58,6 +65,13 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m))) - multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y))) - multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y))) - -+# Composite DTB (i.e. DTB constructed by overlay) -+multi-dtb-y := $(call multi-search, $(dtb-y), .dtb, -dtbs) -+# Primitive DTB compiled from *.dts -+real-dtb-y := $(call real-search, $(dtb-y), .dtb, -dtbs) -+# Base DTB that overlay is applied onto (each first word of $(*-dtbs) expansion) -+base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, .dtb, -dtbs))) -+ - # $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to - # tell kbuild to descend - subdir-obj-y := $(filter %/built-in.o, $(obj-y)) -@@ -69,6 +83,7 @@ real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y) - # Add subdir path - - extra-y := $(addprefix $(obj)/,$(extra-y)) -+always-y := $(addprefix $(obj)/,$(always-y)) - always := $(addprefix $(obj)/,$(always)) - targets := $(addprefix $(obj)/,$(targets)) - modorder := $(addprefix $(obj)/,$(modorder)) -@@ -83,6 +98,8 @@ multi-used-y := $(addprefix $(obj)/,$(multi-used-y)) - multi-used-m := $(addprefix $(obj)/,$(multi-used-m)) - multi-objs-y := $(addprefix $(obj)/,$(multi-objs-y)) - multi-objs-m := $(addprefix $(obj)/,$(multi-objs-m)) -+multi-dtb-y := $(addprefix $(obj)/,$(multi-dtb-y)) -+real-dtb-y := $(addprefix $(obj)/,$(real-dtb-y)) - subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) - - # These flags are needed for modversions and compiling, so we define them here -@@ -296,6 +313,9 @@ endif - - DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) - -+# Set -@ if the target is a base DTB that overlay is applied onto -+DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@) -+ - # Generate an assembly file to wrap the output of the device tree compiler - quiet_cmd_dt_S_dtb= DTB $@ - # Modified for U-Boot -@@ -382,6 +402,13 @@ $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE - $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE - $(call if_changed_dep,dtco) - -+quiet_cmd_fdtoverlay = DTOVL $@ -+ cmd_fdtoverlay = fdtoverlay -o $@ -i $(real-prereqs) -+ -+$(multi-dtb-y): FORCE -+ $(call if_changed,fdtoverlay) -+$(call multi_depend, $(multi-dtb-y), .dtb, -dtbs) -+ - # Fonts - # --------------------------------------------------------------------------- - diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-remove-overlays-and-add-new-dtb-entries-for-zynqmp.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-remove-overlays-and-add-new-dtb-entries-for-zynqmp.patch deleted file mode 100644 index 975200137f..0000000000 --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-remove-overlays-and-add-new-dtb-entries-for-zynqmp.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Prasad Kummari -Date: Fri, 6 Sep 2024 12:38:08 +0530 -Subject: [PATCH] arm64: zynqmp: Remove overlays and add new dtb entries for - ZynqMP - -Remove device tree overlay (DTBO) entries for the ZynqMP target -from the Makefile. Add new device tree binaries (DTBs) for the -zynqmp-sm-k24-revA and zynqmp-smk-k24-revA configurations. - -Signed-off-by: Prasad Kummari -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/20240906070808.1045991-3-prasad.kummari@amd.com -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/290385f374fba69f9c4f473c8bd25d64935a4c82 ---- - arch/arm/dts/Makefile | 24 ++++++------------------ - 1 file changed, 6 insertions(+), 18 deletions(-) - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 8b6f65a61a2..35623380673 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -414,11 +414,6 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ - zynqmp-m-a2197-02-revA.dtb \ - zynqmp-m-a2197-03-revA.dtb \ - zynqmp-p-a2197-00-revA.dtb \ -- zynqmp-p-a2197-00-revA-x-prc-01-revA.dtbo \ -- zynqmp-p-a2197-00-revA-x-prc-02-revA.dtbo \ -- zynqmp-p-a2197-00-revA-x-prc-03-revA.dtbo \ -- zynqmp-p-a2197-00-revA-x-prc-04-revA.dtbo \ -- zynqmp-p-a2197-00-revA-x-prc-05-revA.dtbo \ - zynqmp-mini.dtb \ - zynqmp-mini-emmc0.dtb \ - zynqmp-mini-emmc1.dtb \ -@@ -433,23 +428,10 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ - zynqmp-mini-qspi-x2-stacked.dtb \ - zynqmp-sc-revB.dtb \ - zynqmp-sc-revC.dtb \ -- zynqmp-sc-vek280-revA.dtbo \ -- zynqmp-sc-vek280-revB.dtbo \ -- zynqmp-sc-vhk158-revA.dtbo \ -- zynqmp-sc-vpk120-revB.dtbo \ -- zynqmp-sc-vpk180-revA.dtbo \ -- zynqmp-sc-vpk180-revB.dtbo \ -- zynqmp-sc-vn-p-b2197-00-revA.dtbo \ -- zynqmp-sc-vm-p-m1369-00-revA.dtbo \ - zynqmp-sm-k24-revA.dtb \ - zynqmp-smk-k24-revA.dtb \ - zynqmp-sm-k26-revA.dtb \ - zynqmp-smk-k26-revA.dtb \ -- zynqmp-sck-kd-g-revA.dtbo \ -- zynqmp-sck-kr-g-revA.dtbo \ -- zynqmp-sck-kr-g-revB.dtbo \ -- zynqmp-sck-kv-g-revA.dtbo \ -- zynqmp-sck-kv-g-revB.dtbo \ - zynqmp-topic-miamimp-xilinx-xdp-v1r1.dtb \ - zynqmp-vpk120-revA.dtb \ - zynqmp-vp-x-a2785-00-revA.dtb \ -@@ -497,6 +479,7 @@ zynqmp-sc-vpk120-revB-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vpk120-revB.dtbo - zynqmp-sc-vpk180-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vpk180-revA.dtbo - zynqmp-sc-vpk180-revB-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vpk180-revB.dtbo - zynqmp-sc-vn-p-b2197-00-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vn-p-b2197-00-revA.dtbo -+zynqmp-sc-vm-p-b1369-00-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vm-p-m1369-00-revA.dtbo - - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vek280-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vek280-revB.dtb -@@ -505,6 +488,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vpk120-revB.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vpk180-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vpk180-revB.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vn-p-b2197-00-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sc-vm-p-b1369-00-revA.dtb - - zynqmp-sm-k26-revA-sck-kv-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo - zynqmp-sm-k26-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo -@@ -520,6 +504,8 @@ zynqmp-sm-k24-revA-sck-kd-g-revA-dtbs := zynqmp-sm-k24-revA.dtb zynqmp-sck-kd-g- - zynqmp-smk-k24-revA-sck-kd-g-revA-dtbs := zynqmp-smk-k24-revA.dtb zynqmp-sck-kd-g-revA.dtbo - zynqmp-sm-k24-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k24-revA.dtb zynqmp-sck-kv-g-revB.dtbo - zynqmp-smk-k24-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k24-revA.dtb zynqmp-sck-kv-g-revB.dtbo -+zynqmp-sm-k24-revA-sck-kr-g-revB-dtbs := zynqmp-sm-k24-revA.dtb zynqmp-sck-kr-g-revB.dtbo -+zynqmp-smk-k24-revA-sck-kr-g-revB-dtbs := zynqmp-smk-k24-revA.dtb zynqmp-sck-kr-g-revB.dtbo - - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revB.dtb -@@ -533,6 +519,8 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kd-g-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kd-g-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kv-g-revB.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kv-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kr-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kr-g-revB.dtb - - dtb-$(CONFIG_ARCH_VERSAL) += \ - versal-emb-plus-ve2302-revA.dtb \ diff --git a/board/zynqmp/patches/uboot/0003-binman-add-option-for-pointing-to-separate-description.patch b/board/zynqmp/patches/uboot/0003-binman-add-option-for-pointing-to-separate-description.patch deleted file mode 100644 index 76343afcc3..0000000000 --- a/board/zynqmp/patches/uboot/0003-binman-add-option-for-pointing-to-separate-description.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Michal Simek -Date: Fri, 1 Nov 2024 10:17:54 +0100 -Subject: [PATCH] binman: Add option for pointing to separate description - -Adding binman node with target images description can be unwanted feature -but as of today there is no way to disable it. -Also on size constrained systems it is not useful to add binman description -to DTB. -Introduce BINMAN_DTB Kconfig symbol which allows separate DTB for target -from DTB for binman itself. - -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/f1379d2587f9bf279a7a75c318aabbc1b35ee0c6.1730452668.git.michal.simek@amd.com -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/d92fdb60677b3990919a4216d3452418db215224 ---- - Makefile | 11 ++++++++++- - lib/Kconfig | 9 +++++++++ - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index f049d77dcaf..cb0ff66eccf 100644 ---- a/Makefile -+++ b/Makefile -@@ -1337,12 +1337,21 @@ u-boot.ldr: u-boot - # Use 'make BINMAN_VERBOSE=3' to set vebosity level - default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE)) - -+binman_dtb := $(shell echo $(CONFIG_BINMAN_DTB)) -+ifeq ($(strip $(binman_dtb)),) -+ifeq ($(CONFIG_OF_EMBED),y) -+binman_dtb = ./dts/dt.dtb -+else -+binman_dtb = ./u-boot.dtb -+endif -+endif -+ - quiet_cmd_binman = BINMAN $@ - cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ - $(foreach f,$(BINMAN_TOOLPATHS),--toolpath $(f)) \ - --toolpath $(objtree)/tools \ - $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ -- build -u -d u-boot.dtb -O . -m \ -+ build -u -d $(binman_dtb) -O . -m \ - --allow-missing $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ - -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ - -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ -diff --git a/lib/Kconfig b/lib/Kconfig -index d47df6bb1cf..a1ee51e6eae 100644 ---- a/lib/Kconfig -+++ b/lib/Kconfig -@@ -45,6 +45,15 @@ config BINMAN_FDT - locate entries in the firmware image. See binman.h for the available - functionality. - -+config BINMAN_DTB -+ string "binman DTB description" -+ depends on BINMAN -+ help -+ This enables option to point to different DTB file with binman node which -+ is outside of DTB used by the firmware. Use this option if information -+ about generated images shouldn't be the part of target binary. Or on system -+ with limited storage. -+ - config CC_OPTIMIZE_LIBS_FOR_SPEED - bool "Optimize libraries for speed" - help diff --git a/board/zynqmp/patches/uboot/0004-arm64-zynqmp-describe-empty-binman-node.patch b/board/zynqmp/patches/uboot/0004-arm64-zynqmp-describe-empty-binman-node.patch deleted file mode 100644 index b2923f6199..0000000000 --- a/board/zynqmp/patches/uboot/0004-arm64-zynqmp-describe-empty-binman-node.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: Michal Simek -Date: Fri, 1 Nov 2024 10:17:56 +0100 -Subject: [PATCH] arm64: zynqmp: Describe empty binman node - -For enabling binman by default there is a need to have at least empty node -present that's why create -u-boot.dtsi with empty node to cover all ZynqMP -platforms. - -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/14d874ad4568fa8e3178e893224fecc5c676f04c.1730452668.git.michal.simek@amd.com -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/afbc1fa5f18a2eebf1cf06f62574016edc093f50 ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/zynqmp-binman-mini.dts | 10 ++++++++++ - arch/arm/dts/zynqmp-u-boot.dtsi | 11 +++++++++++ - 3 files changed, 22 insertions(+) - create mode 100644 arch/arm/dts/zynqmp-binman-mini.dts - create mode 100644 arch/arm/dts/zynqmp-u-boot.dtsi - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 35623380673..4bdfb204ae3 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -426,6 +426,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ - zynqmp-mini-qspi-x1-stacked.dtb \ - zynqmp-mini-qspi-x2-single.dtb \ - zynqmp-mini-qspi-x2-stacked.dtb \ -+ zynqmp-binman-mini.dtb \ - zynqmp-sc-revB.dtb \ - zynqmp-sc-revC.dtb \ - zynqmp-sm-k24-revA.dtb \ -diff --git a/arch/arm/dts/zynqmp-binman-mini.dts b/arch/arm/dts/zynqmp-binman-mini.dts -new file mode 100644 -index 00000000000..8f3d18ef394 ---- /dev/null -+++ b/arch/arm/dts/zynqmp-binman-mini.dts -@@ -0,0 +1,10 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * (C) Copyright 2024, Advanced Micro Devices, Inc. -+ * -+ * Michal Simek -+ */ -+ -+/dts-v1/; -+ -+#include "zynqmp-u-boot.dtsi" -diff --git a/arch/arm/dts/zynqmp-u-boot.dtsi b/arch/arm/dts/zynqmp-u-boot.dtsi -new file mode 100644 -index 00000000000..9a7527ed5a1 ---- /dev/null -+++ b/arch/arm/dts/zynqmp-u-boot.dtsi -@@ -0,0 +1,11 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * (C) Copyright 2024, Advanced Micro Devices, Inc. -+ * -+ * Michal Simek -+ */ -+ -+/ { -+ binman: binman { -+ }; -+}; diff --git a/board/zynqmp/patches/uboot/0005-arm64-zynqmp-add-binman-description-for-som.patch b/board/zynqmp/patches/uboot/0005-arm64-zynqmp-add-binman-description-for-som.patch deleted file mode 100644 index 82b5ba8bc0..0000000000 --- a/board/zynqmp/patches/uboot/0005-arm64-zynqmp-add-binman-description-for-som.patch +++ /dev/null @@ -1,345 +0,0 @@ -From: Michal Simek -Date: Fri, 1 Nov 2024 10:17:57 +0100 -Subject: [PATCH] arm64: zynqmp: Add binman description for SOM - -There is necessary to do some steps to compose boot images. These steps -were in scripts in layers for a while. That's why introduce description via -binman to simplify wiring and remove all scripting around. -This should make sure that everybody is up2date with the latest versions. - -The first step is to create fit image with DTBs with descriptions in -configuration node which is written as regular expression to match all SOM -versions. -Description is there for k24 and k26 in spite of low level psu_init -configuration is different. The reason is that it goes to u-boot.itb image -which is the same for k24 and k26. -u-boot.itb is another image which is generated. It is normally generated -via arch/arm/mach-zynqmp/mkimage_fit_atf.sh but this script is supposed to -be deprecated. -FIT image by purpose is using 64bit addresses to have default option to -move images to high DDR (above 4GB). TF-A and TEE are optional components -but in the most cases TF-A is present all the time and TEE(OP-TEE) is used -by some configurations too. - -3rd generated image is boot.bin with updated user field which contains -version number. This image can be used with updated Image Selector -which supports A/B update mechanisms with rollback protection. - -4th image is image.bin which binary file which contains boot.bin and -u-boot.itb together and can be programmed via origin Image Selector. -This image can be also used for creating one capsule which contains both -boot images (in SPL boot flow). - -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/35bc47a4a4799c5f5dbea56a45340a2810538330.1730452668.git.michal.simek@amd.com -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/2eb8cd5bd4936a5eb2e77729855d946f6720921c ---- - arch/arm/Kconfig | 1 + - arch/arm/dts/Makefile | 1 + - arch/arm/dts/zynqmp-binman-som.dts | 225 +++++++++++++++++++++++++++ - arch/arm/mach-zynqmp/Kconfig | 14 ++ - configs/xilinx_zynqmp_kria_defconfig | 3 + - 5 files changed, 244 insertions(+) - create mode 100644 arch/arm/dts/zynqmp-binman-som.dts - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index cbe72103aab..dca493eaf55 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1302,6 +1302,7 @@ config ARCH_ZYNQMP_R5 - config ARCH_ZYNQMP - bool "Xilinx ZynqMP based platform" - select ARM64 -+ select BINMAN - select CLK - select DM - select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 4bdfb204ae3..4653b5bdd16 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -522,6 +522,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kv-g-revB.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kv-g-revB.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kr-g-revB.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kr-g-revB.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-binman-som.dtb - - dtb-$(CONFIG_ARCH_VERSAL) += \ - versal-emb-plus-ve2302-revA.dtb \ -diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts -new file mode 100644 -index 00000000000..3d9d8476c98 ---- /dev/null -+++ b/arch/arm/dts/zynqmp-binman-som.dts -@@ -0,0 +1,225 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * dts file for Xilinx ZynqMP SOMs (k24/k26) -+ * -+ * (C) Copyright 2024, Advanced Micro Devices, Inc. -+ * -+ * Michal Simek -+ */ -+ -+#include -+ -+/dts-v1/; -+/ { -+ binman: binman { -+ multiple-images; -+ fit-dtb.blob { -+ filename = "fit-dtb.blob"; -+ pad-byte = <0>; -+ fit { -+ fit,align = <0x8>; -+ fit,external-offset = <0x0>; -+ description = "DTBs for SOMs+CCs"; -+ fit,fdt-list-val = "zynqmp-smk-k26-revA", "zynqmp-smk-k26-revA-sck-kr-g-revA", -+ "zynqmp-smk-k26-revA-sck-kr-g-revB", "zynqmp-smk-k26-revA-sck-kv-g-revA", -+ "zynqmp-smk-k26-revA-sck-kv-g-revB", "zynqmp-sm-k26-revA-sck-kv-g-revA", -+ "zynqmp-sm-k26-revA-sck-kv-g-revB", "zynqmp-sm-k26-revA-sck-kr-g-revB", -+ "zynqmp-smk-k24-revA-sck-kd-g-revA", "zynqmp-smk-k24-revA-sck-kv-g-revB", -+ "zynqmp-smk-k24-revA-sck-kr-g-revB", "zynqmp-sm-k24-revA-sck-kd-g-revA", -+ "zynqmp-sm-k24-revA-sck-kv-g-revB", "zynqmp-sm-k24-revA-sck-kr-g-revB"; -+ -+ images { -+ @fdt-SEQ { -+ description = "NAME"; -+ type = "flat_dt"; -+ arch = "arm64"; -+ compression = "none"; -+ hash-1 { -+ algo = "md5"; -+ }; -+ }; -+ }; -+ configurations { -+ default = "conf-1"; -+ conf-1 { -+ description = "SOM itself"; -+ fdt = "fdt-1"; -+ }; -+ conf-2 { -+ description = "zynqmp-smk-k26-.*-sck-kr-g-revA"; -+ fdt = "fdt-2"; -+ }; -+ conf-3 { -+ description = "zynqmp-smk-k26-.*-sck-kr-g-.*"; -+ fdt = "fdt-3"; -+ }; -+ conf-4 { -+ description = "zynqmp-smk-k26-.*-sck-kv-g-rev[AZ]"; -+ fdt = "fdt-4"; -+ }; -+ conf-5 { -+ description = "zynqmp-smk-k26-.*-sck-kv-g-.*"; -+ fdt = "fdt-5"; -+ }; -+ conf-6 { -+ description = "zynqmp-sm-k26-.*-sck-kv-g-rev[AZ]"; -+ fdt = "fdt-6"; -+ }; -+ conf-7 { -+ description = "zynqmp-sm-k26-.*-sck-kv-g-.*"; -+ fdt = "fdt-7"; -+ }; -+ conf-8 { -+ description = "zynqmp-sm-k26-.*-sck-kr-g-.*"; -+ fdt = "fdt-8"; -+ }; -+ conf-9 { -+ description = "zynqmp-smk-k24-.*-sck-kd-g-.*"; -+ fdt = "fdt-9"; -+ }; -+ conf-10 { -+ description = "zynqmp-smk-k24-.*-sck-kv-g-.*"; -+ fdt = "fdt-10"; -+ }; -+ conf-11 { -+ description = "zynqmp-smk-k24-.*-sck-kr-g-.*"; -+ fdt = "fdt-11"; -+ }; -+ conf-12 { -+ description = "zynqmp-sm-k24-.*-sck-kd-g-.*"; -+ fdt = "fdt-12"; -+ }; -+ conf-13 { -+ description = "zynqmp-sm-k24-.*-sck-kv-g-.*"; -+ fdt = "fdt-13"; -+ }; -+ conf-14 { -+ description = "zynqmp-sm-k24-.*-sck-kr-g-.*"; -+ fdt = "fdt-14"; -+ }; -+ }; -+ }; -+ }; -+ -+ /* u-boot.itb generation in a static way */ -+ itb { -+ filename = "u-boot.itb"; -+ pad-byte = <0>; -+ -+ fit { -+ description = "Configuration for Xilinx ZynqMP SoC"; -+ fit,align = <0x8>; -+ fit,external-offset = <0x0>; -+ images { -+ uboot { -+ description = "U-Boot (64-bit)"; -+ type = "firmware"; -+ os = "u-boot"; -+ arch = "arm64"; -+ compression = "none"; -+ load = /bits/ 64 ; -+ entry = /bits/ 64 ; -+ hash { -+ algo = "md5"; -+ }; -+ u-boot-nodtb { -+ }; -+ }; -+ atf { -+ description = "Trusted Firmware-A"; -+ type = "firmware"; -+ os = "arm-trusted-firmware"; -+ arch = "arm64"; -+ compression = "none"; -+ load = /bits/ 64 ; -+ entry = /bits/ 64 ; -+ hash { -+ algo = "md5"; -+ }; -+ atf-bl31 { -+ optional; -+ }; -+ }; -+ tee { -+ description = "OP-TEE"; -+ type = "tee"; -+ arch = "arm64"; -+ compression = "none"; -+ os = "tee"; -+ load = /bits/ 64 ; -+ entry = /bits/ 64 ; -+ tee-os { -+ optional; -+ }; -+ }; -+ fdt { -+ description = "Multi DTB fit image"; -+ type = "flat_dt"; -+ arch = "arm64"; -+ compression = "none"; -+ load = <0x0 0x100000>; -+ hash { -+ algo = "md5"; -+ }; -+ fdt-blob { -+ filename = "fit-dtb.blob"; -+ type = "blob-ext"; -+ }; -+ }; -+ }; -+ configurations { -+ default = "conf-1"; -+ conf-1 { -+ description = "Multi DTB with TF-A/TEE"; -+ firmware = "atf"; -+ loadables = "tee", "uboot", "fdt"; -+ }; -+ }; -+ }; -+ }; -+ -+ /* boot.bin generated with version string inside */ -+ bootimage { -+ filename = "boot.bin"; -+ pad-byte = <0>; -+ -+ blob-ext@1 { -+ offset = <0x0>; -+ filename = "spl/boot.bin"; -+ }; -+ /* Optional version string at offset 0x70 */ -+ blob-ext@2 { -+ offset = <0x70>; -+ filename = "version.bin"; -+ overlap; -+ optional; -+ }; -+ /* Optional version string at offset 0x94 */ -+ blob-ext@3 { -+ offset = <0x94>; -+ filename = "version.bin"; -+ overlap; -+ optional; -+ }; -+ }; -+ -+#ifdef CONFIG_SYS_SPI_U_BOOT_OFFS -+ /* Full QSPI image for recovery app */ -+ image { -+ filename = "qspi.bin"; -+ pad-byte = <0>; -+ -+ blob-ext@1 { -+ offset = <0x0>; -+ filename = "boot.bin"; -+ }; -+ blob-ext@2 { -+ offset = ; -+ filename = "u-boot.itb"; -+ }; -+ fdtmap { -+ }; -+ }; -+#endif -+ }; -+}; -diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig -index 46c7fc75537..341c8379946 100644 ---- a/arch/arm/mach-zynqmp/Kconfig -+++ b/arch/arm/mach-zynqmp/Kconfig -@@ -140,6 +140,20 @@ config SPL_ZYNQMP_RESTORE_JTAG - even if no eFuses were burnt. This option restores the interface if - possible. - -+config BL31_LOAD_ADDR -+ hex "Load address of BL31 image (mostly TF-A)" -+ default 0xfffea000 -+ help -+ The load address for the BL31 image. This value is used to build the -+ FIT image header that places BL31 in memory where it will run. -+ -+config BL32_LOAD_ADDR -+ hex "Load address of BL32 image (mostly secure OS)" -+ default 0 -+ help -+ The load address for the BL32 image. This value is used to build the -+ FIT image header that places BL32 in memory where it will run. -+ - config ZYNQ_SDHCI_MAX_FREQ - default 200000000 - -diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig -index 32d40939ac1..7b0e1a63483 100644 ---- a/configs/xilinx_zynqmp_kria_defconfig -+++ b/configs/xilinx_zynqmp_kria_defconfig -@@ -39,6 +39,7 @@ CONFIG_BOARD_EARLY_INIT_R=y - CONFIG_CLOCKS=y - CONFIG_SPL_MAX_SIZE=0x40000 - CONFIG_SPL_BSS_MAX_SIZE=0x80000 -+# CONFIG_SPL_BINMAN_SYMBOLS is not set - # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set - CONFIG_SPL_STACK_R=y - CONFIG_SPL_FS_LOAD_KERNEL_NAME="" -@@ -223,6 +224,8 @@ CONFIG_VIDEO_ZYNQMP_DPSUB=y - CONFIG_VIRTIO_MMIO=y - CONFIG_VIRTIO_NET=y - CONFIG_VIRTIO_BLK=y -+# CONFIG_BINMAN_FDT is not set -+CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-som.dtb" - CONFIG_PANIC_HANG=y - CONFIG_TPM=y - CONFIG_SPL_GZIP=y diff --git a/board/zynqmp/patches/uboot/0006-arm64-zynqmp-generate-u-boot.itb-and-qspi-image-via-binman.patch b/board/zynqmp/patches/uboot/0006-arm64-zynqmp-generate-u-boot.itb-and-qspi-image-via-binman.patch deleted file mode 100644 index af55013917..0000000000 --- a/board/zynqmp/patches/uboot/0006-arm64-zynqmp-generate-u-boot.itb-and-qspi-image-via-binman.patch +++ /dev/null @@ -1,159 +0,0 @@ -From: Michal Simek -Date: Fri, 1 Nov 2024 10:17:58 +0100 -Subject: [PATCH] arm64: zynqmp: Generate u-boot.itb and QSPI image via binman - -u-boot.itb has been generated via mkimage_fit_atf.sh but it is on the way -out that's why convert it's description to binman. -Compare to script binman description is not able to configure BL31 and BL32 -load/entry addresses which should be done separately. - -Signed-off-by: Michal Simek -Link: https://lore.kernel.org/r/90b613796aee38158252c8bb1dfc3da0420f089d.1730452668.git.michal.simek@amd.com -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/a4c98119109a60b9b236996f47065aa8fc0de9ca ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/zynqmp-binman.dts | 111 +++++++++++++++++++++++++++ - configs/xilinx_zynqmp_virt_defconfig | 3 + - 3 files changed, 115 insertions(+) - create mode 100644 arch/arm/dts/zynqmp-binman.dts - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 4653b5bdd16..f4e4149e85c 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -472,6 +472,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-02-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-03-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-04-revA.dtb - dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-05-revA.dtb -+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-binman.dtb - - zynqmp-sc-vek280-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vek280-revA.dtbo - zynqmp-sc-vek280-revB-dtbs := zynqmp-sc-revC.dtb zynqmp-sc-vek280-revB.dtbo -diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts -new file mode 100644 -index 00000000000..df0fdf46510 ---- /dev/null -+++ b/arch/arm/dts/zynqmp-binman.dts -@@ -0,0 +1,111 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * dts file for Xilinx ZynqMP platforms -+ * -+ * (C) Copyright 2024, Advanced Micro Devices, Inc. -+ * -+ * Michal Simek -+ */ -+ -+#include -+ -+/dts-v1/; -+/ { -+ binman: binman { -+ multiple-images; -+ -+ /* u-boot.itb generation in a static way */ -+ itb { -+ filename = "u-boot.itb"; -+ pad-byte = <0>; -+ -+ fit { -+ description = "Configuration for Xilinx ZynqMP SoC"; -+ fit,align = <0x8>; -+ fit,external-offset = <0x0>; -+ fit,fdt-list = "of-list"; -+ images { -+ uboot { -+ description = "U-Boot (64-bit)"; -+ type = "firmware"; -+ os = "u-boot"; -+ arch = "arm64"; -+ compression = "none"; -+ load = /bits/ 64 ; -+ entry = /bits/ 64 ; -+ hash { -+ algo = "md5"; -+ }; -+ u-boot-nodtb { -+ }; -+ }; -+ atf { -+ description = "Trusted Firmware-A"; -+ type = "firmware"; -+ os = "arm-trusted-firmware"; -+ arch = "arm64"; -+ compression = "none"; -+ load = /bits/ 64 ; -+ entry = /bits/ 64 ; -+ hash { -+ algo = "md5"; -+ }; -+ atf-bl31 { -+ optional; -+ }; -+ }; -+ tee { -+ description = "OP-TEE"; -+ type = "tee"; -+ arch = "arm64"; -+ compression = "none"; -+ os = "tee"; -+ load = /bits/ 64 ; -+ entry = /bits/ 64 ; -+ tee-os { -+ optional; -+ }; -+ }; -+ @fdt-SEQ { -+ description = "NAME"; -+ type = "flat_dt"; -+ arch = "arm64"; -+ compression = "none"; -+ load = <0x0 0x100000>; -+ hash-1 { -+ algo = "md5"; -+ }; -+ }; -+ }; -+ configurations { -+ default = "@conf-DEFAULT-SEQ"; -+ @conf-SEQ { -+ description = "NAME"; -+ firmware = "atf"; -+ loadables = "tee", "uboot"; -+ fdt = "fdt-SEQ"; -+ }; -+ }; -+ }; -+ }; -+ -+#ifdef CONFIG_SYS_SPI_U_BOOT_OFFS -+ /* QSPI image for testing QSPI boot mode */ -+ image { -+ filename = "qspi.bin"; -+ pad-byte = <0>; -+ -+ blob-ext@1 { -+ offset = <0x0>; -+ filename = "spl/boot.bin"; -+ }; -+ blob-ext@2 { -+ offset = ; -+ filename = "u-boot.itb"; -+ }; -+ fdtmap { -+ }; -+ }; -+#endif -+ }; -+}; -diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig -index cc298b200a1..2643ce2acf7 100644 ---- a/configs/xilinx_zynqmp_virt_defconfig -+++ b/configs/xilinx_zynqmp_virt_defconfig -@@ -243,3 +243,6 @@ CONFIG_EFI_SET_TIME=y - CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y - CONFIG_EFI_CAPSULE_ON_DISK=y - CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y -+# CONFIG_SPL_BINMAN_SYMBOLS is not set -+# CONFIG_BINMAN_FDT is not set -+CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman.dtb" diff --git a/boot/xilinx-embeddedsw/Config.in b/boot/xilinx-embeddedsw/Config.in index a27253d594..12924edf44 100644 --- a/boot/xilinx-embeddedsw/Config.in +++ b/boot/xilinx-embeddedsw/Config.in @@ -1,5 +1,5 @@ -comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf" - depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-xilinx-elf" +comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-buildroot-elf" + depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf" menuconfig BR2_TARGET_XILINX_EMBEDDEDSW bool "xilinx-embeddedsw" @@ -21,7 +21,7 @@ if BR2_TARGET_XILINX_EMBEDDEDSW config BR2_TARGET_XILINX_EMBEDDEDSW_VERSION string "xilinx-embeddedsw version" - default "xilinx_v2024.2" + default "xilinx_v2025.1" help Release version of Xilinx/embeddedsw. Must be xilinx_v2023.1 or newer. diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash b/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash index f9eb6f7984..0a42bab314 100644 --- a/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash +++ b/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 550ba0b206848adb0085bc1ca5a6b6731681335c92912afb4a6a8dbb4c489a0c xilinx-embeddedsw-xilinx_v2024.2.tar.gz +sha256 867b7c7652f754d1a3d6edfe76e53223670e2b4c7e4144d4db1604403d68f616 xilinx-embeddedsw-xilinx_v2025.1.tar.gz # Locally calculated -sha256 12bf8dad928a59644758825758b0c9d42d54478f5b04c8beb714d6f792450849 license.txt +sha256 fbee87edd32cf203fdd7925f0bab15c98e2dc1e0d61e70867f1190dc4a605b12 license.txt diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk index 7d4fcf8b8f..abcfee255d 100644 --- a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk +++ b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk @@ -12,6 +12,17 @@ XILINX_EMBEDDEDSW_INSTALL_TARGET = NO XILINX_EMBEDDEDSW_INSTALL_IMAGES = YES XILINX_EMBEDDEDSW_DEPENDENCIES = toolchain-bare-metal-buildroot +XILINX_EMBEDDEDSW_MICROBLAZE_CC = $(call qstrip, \ + $(if $(wildcard $(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc), \ + $(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc, \ + $(HOST_DIR)/bin/microblazeel-buildroot-elf-gcc)) +XILINX_EMBEDDEDSW_MICROBLAZE_AR = $(XILINX_EMBEDDEDSW_MICROBLAZE_CC)-ar + +ifeq ($(basename $(notdir $(XILINX_EMBEDDEDSW_MICROBLAZE_CC))),microblazeel-xilinx-elf-gcc) +$(warning microblazeel-xilinx-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is not supported anymore!) +$(error Replace microblazeel-xilinx-elf with microblazeel-buildroot-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH) +endif + # ZYNQMP_PMUFW application allows users to add cflags XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS = \ $(call qstrip,$(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS)) @@ -23,9 +34,9 @@ XILINX_EMBEDDEDSW_CFLAGS = "-Os -flto -ffat-lto-objects" ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y) define XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM $(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal \ - COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ - ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \ - CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS) endef @@ -38,9 +49,9 @@ endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW),y) define XILINX_EMBEDDEDSW_BUILD_VERSAL_PSMFW $(MAKE) -C $(@D)/lib/sw_apps/versal_psmfw/src/versal \ - COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ - ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \ - CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS) endef @@ -53,9 +64,9 @@ endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW),y) define XILINX_EMBEDDEDSW_BUILD_ZYNQMP_PMUFW $(MAKE) -C $(@D)/lib/sw_apps/zynqmp_pmufw/src \ - COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ - ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \ - CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ CFLAGS=$(XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_CFLAGS) endef diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in index b95df5cbf4..836cd8b68a 100644 --- a/boot/xilinx-prebuilt/Config.in +++ b/boot/xilinx-prebuilt/Config.in @@ -18,7 +18,7 @@ if BR2_TARGET_XILINX_PREBUILT config BR2_TARGET_XILINX_PREBUILT_VERSION string "prebuilt version" - default "xilinx_v2024.2_update1" + default "xilinx_v2025.1" help Release version of Xilinx firmware. Must be xilinx_v2023.1 or newer. @@ -63,6 +63,15 @@ config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION 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 + 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. + config BR2_TARGET_XILINX_PREBUILT_FAMILY string default "zynqmp" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash index 35f7070e5f..9f12e88e7a 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.hash +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 86ee9629366aa8c0d70b87202152a793804ed4090e3a6fdac4eaf855bcc4d458 xilinx-prebuilt-xilinx_v2024.2_update1.tar.gz +sha256 b9e2572885ad12243e10d48d9fccb24771a528b9f27aae1b29b45f0806ce9f1f xilinx-prebuilt-xilinx_v2025.1.tar.gz # Locally calculated sha256 7b2074b607264a07347e1a7ef0323229585942793469f34b2cf9628f7623e05f LICENSE diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index d0817d3cc7..62b60b88fa 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -19,7 +19,6 @@ XILINX_PREBUILT_LICENSE = MIT XILINX_PREBUILT_LICENSE_FILES = LICENSE endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA -XILINX_PREBUILT_INSTALL_TARGET = NO XILINX_PREBUILT_INSTALL_IMAGES = YES XILINX_PREBUILT_FAMILY = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_FAMILY)) @@ -28,9 +27,6 @@ XILINX_PREBUILT_BOARD = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_BOARD)) XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAMILY) ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) -# We need the *.pdi glob, because the file has different names for the -# different boards, but there is only one, and it has to be named -# vpl_gen_fixed.pdi when installed. ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf # Unlike the psmfw.elf file for Xilinx development boards, @@ -39,11 +35,57 @@ XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf # so to support current and future AMD Vivado versions, the filename # psm*fw.elf is used. XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf -XILINX_PREBUILT_PDI = $(@D)/*.pdi +# 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 +# the file that has "_boot.pdi" in the filename. +define XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI + $(INSTALL) -D -m 0644 \ + $(if $(wildcard $(@D)/*_boot.pdi), \ + $(@D)/*_boot.pdi, \ + $(@D)/*.pdi \ + ) \ + $(BINARIES_DIR)/boot.pdi +endef + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI),y) +# Install pld.pdi in target file system for run-time loading when using +# Versal Segmented Configuration. +define XILINX_PREBUILT_INSTALL_VERSAL_XSA_PLD_PDI + $(if $(wildcard $(@D)/*_pld.pdi), + mkdir -p $(TARGET_DIR)/lib/firmware/xilinx && \ + $(INSTALL) -D -m 0644 $(@D)/*_pld.pdi \ + $(TARGET_DIR)/lib/firmware/xilinx + ) +endef +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf -XILINX_PREBUILT_PDI = $(XILINX_PREBUILT_BOARD_DIR)/*.pdi +# 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 +# the file that has "_boot.pdi" in the filename. +define XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI + $(INSTALL) -D -m 0644 \ + $(if $(wildcard $(XILINX_PREBUILT_BOARD_DIR)/*_boot.pdi), \ + $(XILINX_PREBUILT_BOARD_DIR)/*_boot.pdi, \ + $(XILINX_PREBUILT_BOARD_DIR)/*.pdi \ + ) \ + $(BINARIES_DIR)/boot.pdi +endef + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI),y) +# Install pld.pdi in target file system for run-time loading when using +# Versal Segmented Configuration. +define XILINX_PREBUILT_INSTALL_VERSAL_PLD_PDI + $(if $(wildcard $(XILINX_PREBUILT_BOARD_DIR)/*_pld.pdi), + mkdir -p $(TARGET_DIR)/lib/firmware/xilinx && \ + $(INSTALL) -D -m 0644 $(XILINX_PREBUILT_BOARD_DIR)/*_pld.pdi \ + $(TARGET_DIR)/lib/firmware/xilinx + ) +endef +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y) @@ -60,10 +102,6 @@ define XILINX_PREBUILT_INSTALL_VERSAL_PSMFW endef endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW -define XILINX_PREBUILT_INSTALL_VERSAL_PDI - $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PDI) \ - $(BINARIES_DIR)/vpl_gen_fixed.pdi -endef else # BR2_TARGET_XILINX_PREBUILT_VERSAL ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW),y) define XILINX_PREBUILT_INSTALL_ZYNQMP_PMUFW @@ -76,8 +114,14 @@ endif # BR2_TARGET_XILINX_PREBUILT_VERSAL define XILINX_PREBUILT_INSTALL_IMAGES_CMDS $(XILINX_PREBUILT_INSTALL_VERSAL_PLM) $(XILINX_PREBUILT_INSTALL_VERSAL_PSMFW) - $(XILINX_PREBUILT_INSTALL_VERSAL_PDI) + $(XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI) + $(XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI) $(XILINX_PREBUILT_INSTALL_ZYNQMP_PMUFW) endef +define XILINX_PREBUILT_INSTALL_TARGET_CMDS + $(XILINX_PREBUILT_INSTALL_VERSAL_PLD_PDI) + $(XILINX_PREBUILT_INSTALL_VERSAL_XSA_PLD_PDI) +endef + $(eval $(generic-package)) diff --git a/configs/coolpi_4b_defconfig b/configs/coolpi_4b_defconfig new file mode 100644 index 0000000000..c9b5a86758 --- /dev/null +++ b/configs/coolpi_4b_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_14=y +BR2_GLOBAL_PATCH_DIR="board/coolpi/coolpi-4b/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="coolpi" +BR2_TARGET_GENERIC_ISSUE="Welcome to the CoolPi 4B" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/coolpi/coolpi-4b/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.14.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588s-coolpi-4b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.48.elf" +BR2_PACKAGE_LIBDRM=y +BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y +BR2_PACKAGE_OPENSSH=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="coolpi-4b-rk3588s" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/raspberrypicm5io_defconfig b/configs/raspberrypicm5io_defconfig new file mode 100644 index 0000000000..9bfde8f501 --- /dev/null +++ b/configs/raspberrypicm5io_defconfig @@ -0,0 +1,35 @@ +BR2_aarch64=y +BR2_cortex_a76=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm5io/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm5io/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,cd231d4775b14f228606c09f219b48308f6ab3aa)/linux-cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-cm5-cm5io broadcom/bcm2712-rpi-cm5l-cm5io" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm5io/config_cm5io.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypicm5io/cmdline.txt" +BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 368133e916..9b5fbc254f 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,16 +1,18 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -21,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 1d83e55499..ffa0dd86e6 100644 --- a/configs/versal_vek280_defconfig +++ b/configs/versal_vek280_defconfig @@ -1,16 +1,18 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vek280-revB" @@ -21,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 7729c655c3..e0966cc986 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -1,16 +1,18 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" @@ -21,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 f9be297b99..fb324b5a3c 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -2,14 +2,16 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 4c6361a9b7..f908a39a7f 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -2,14 +2,16 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 bc853f522d..7d7f468805 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,14 +2,16 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 d0fbaf2ea5..1a5d48e424 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,14 +2,16 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 4ba4be861f..90ccfe9a79 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -1,15 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/zynqmp/kria/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" @@ -20,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 fdd868bbb5..ae63bf487f 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -1,15 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/zynqmp/kria/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" @@ -20,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 ff03f87b54..805c7f054e 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,15 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/zynqmp/kria/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -20,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 856c1d896d..7d4187684f 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,15 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -20,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 c21058be74..ccadf6183b 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -1,15 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" @@ -20,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_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 5e13c39a1a..8630a40510 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,15 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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-xilinx-elf" -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches board/xilinx/patches" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -20,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.10_2024.2)/xlnx_rebase_v2.10_2024.2.tar.gz" +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_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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz" +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_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/docs/manual/migrating.adoc b/docs/manual/migrating.adoc index ac40197147..4e6225a987 100644 --- a/docs/manual/migrating.adoc +++ b/docs/manual/migrating.adoc @@ -215,3 +215,10 @@ Cargo.lock file mandatory and the change from +.cargo/config+ to +.cargo/config.toml+, tarballs generated by Cargo-fetched packages have changed. Therefore the suffix of such tarballs has been changed from +-cargo2+ to +-cargo4+. + +[[migrating-systemd]] +=== Migrating to 2025.08 + +In 2025.08, starting with systemd version 257, systemd-networkd requires kernel +5.4 or later. If you are still using a kernel older than 5.4, please update +your kernel or use an alternative network manager. diff --git a/package/Config.in b/package/Config.in index 579b5ffc87..10f6856dea 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "External python modules" source "package/python-schedule/Config.in" source "package/python-scipy/Config.in" source "package/python-sdbus/Config.in" + source "package/python-sdbus-modemmanager/Config.in" source "package/python-sdbus-networkmanager/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" @@ -1787,6 +1788,8 @@ menu "Graphics" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencl-clhpp/Config.in" + source "package/opencl-headers/Config.in" + source "package/opencl-icd-loader/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opencv4-contrib/Config.in" @@ -2304,6 +2307,7 @@ endif source "package/mpfr/Config.in" source "package/mpir/Config.in" source "package/msgpack/Config.in" + source "package/msgpack-c/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" source "package/neon-2-sse/Config.in" @@ -2817,6 +2821,7 @@ comment "Utilities" source "package/tini/Config.in" source "package/tmux/Config.in" source "package/ttyd/Config.in" + source "package/uuu/Config.in" source "package/which/Config.in" source "package/wlr-randr/Config.in" source "package/wtfutil/Config.in" diff --git a/package/alsa-lib/0002-configure-Make-sequencer-dependent-on-rawmidi.patch b/package/alsa-lib/0002-configure-Make-sequencer-dependent-on-rawmidi.patch deleted file mode 100644 index fb1d18df36..0000000000 --- a/package/alsa-lib/0002-configure-Make-sequencer-dependent-on-rawmidi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Takashi Iwai -Date: Sun, 24 Nov 2024 08:32:29 +0000 (+0100) -Subject: configure: Make sequencer dependent on rawmidi -X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=6880219ad4ba55ae8a94a34b7a987b3369f7c96f - -configure: Make sequencer dependent on rawmidi - -The sequencer feature requires rawmidi implicitly, and it became more -obvious with UMP support. Add the dependency check to configure -script. - -Signed-off-by: Takashi Iwai - -Upstream: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=6880219ad4ba55ae8a94a34b7a987b3369f7c96f - -Signed-off-by: Bernd Kuhls ---- - -diff --git a/configure.ac b/configure.ac -index 1cd22a59..69aeb978 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -483,6 +483,12 @@ fi - AC_SUBST(PYTHON_LIBS) - AC_SUBST(PYTHON_INCLUDES) - -+if test "$build_rawmidi" != "yes"; then -+ if test "$build_seq" = "yes"; then -+ AC_ERROR([Cannot enable sequencer without rawmidi]) -+ fi -+fi -+ - AM_CONDITIONAL([BUILD_MIXER], [test x$build_mixer = xyes]) - AM_CONDITIONAL([BUILD_PCM], [test x$build_pcm = xyes]) - AM_CONDITIONAL([BUILD_RAWMIDI], [test x$build_rawmidi = xyes]) diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 360122f97f..304f947f83 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -73,11 +73,6 @@ config BR2_PACKAGE_ALSA_LIB_UCM depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ALSA_LIB_MIXER -config BR2_PACKAGE_ALSA_LIB_ALISP - bool "alisp" - default y - depends on BR2_USE_MMU - config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS bool "old-symbols" default y diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 0533df7954..26d54b6e1b 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8c4ff37553cbe89618e187e4c779f71a9bb2a8b27b91f87ed40987cc9233d8f6 alsa-lib-1.2.13.tar.bz2 +sha256 be9c88a0b3604367dd74167a2b754a35e142f670292ae47a2fdef27a2ee97a32 alsa-lib-1.2.14.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 6272fa69df..34c1688e98 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.13 +ALSA_LIB_VERSION = 1.2.14 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) @@ -52,9 +52,6 @@ endif ifneq ($(BR2_PACKAGE_ALSA_LIB_UCM),y) ALSA_LIB_CONF_OPTS += --disable-ucm endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y) -ALSA_LIB_CONF_OPTS += --disable-alisp -endif ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y) ALSA_LIB_CONF_OPTS += --disable-old-symbols endif diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index c43ffd62cb..fd03588294 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1702a6b1cdf9ba3e996ecbc1ddcf9171e6808f5961d503d0f27e80ee162f1daa alsa-utils-1.2.13.tar.bz2 +sha256 0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741 alsa-utils-1.2.14.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index cb5129ece3..64da2201bf 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.13 +ALSA_UTILS_VERSION = 1.2.14 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 diff --git a/package/bats-core/bats-core.hash b/package/bats-core/bats-core.hash index e528f0fc10..60e52e9214 100644 --- a/package/bats-core/bats-core.hash +++ b/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5c57ed9616b78f7fd8c553b9bae3c7c9870119edd727ec17dbd1185c599f79d9 bats-core-1.11.1.tar.gz +sha256 e36b020436228262731e3319ed013d84fcd7c4bd97a1b34dee33d170e9ae6bab bats-core-1.12.0.tar.gz # License files sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/package/bats-core/bats-core.mk b/package/bats-core/bats-core.mk index 5e1c9c4bbc..53d3b5405b 100644 --- a/package/bats-core/bats-core.mk +++ b/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.11.1 +BATS_CORE_VERSION = 1.12.0 BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) BATS_CORE_LICENSE = MIT BATS_CORE_LICENSE_FILES = LICENSE.md 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 new file mode 100644 index 0000000000..6d048e9bd9 --- /dev/null +++ b/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch @@ -0,0 +1,72 @@ +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//"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 "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 "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 "FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +-- +2.25.1 + diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash index d040a2e280..7670a5d1ee 100644 --- a/package/bootgen/bootgen.hash +++ b/package/bootgen/bootgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c8345a3bea4fcec6ceb6c8f8e727a610aaca3ec71cdf7f892d7f89f88438650 bootgen-xilinx_v2024.2.tar.gz -sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE +sha256 3de43a331e10b2a8079d4681ad72cef4884bc3a09250d3d80811d677f3ffe560 bootgen-xilinx_v2025.1.tar.gz +sha256 36e278ff2cc9ef95154a923bf4a9450414f358779045ae4f863c8d77fb18dbdb LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk index 51eacde462..939872b29c 100644 --- a/package/bootgen/bootgen.mk +++ b/package/bootgen/bootgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTGEN_VERSION = xilinx_v2024.2 +BOOTGEN_VERSION = xilinx_v2025.1 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf BOOTGEN_LICENSE = Apache-2.0 @@ -19,7 +19,7 @@ define HOST_BOOTGEN_BUILD_CMDS endef define HOST_BOOTGEN_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/bootgen $(HOST_DIR)/bin/bootgen + $(INSTALL) -m 0755 -D $(@D)/build/bin/bootgen $(HOST_DIR)/bin/bootgen endef $(eval $(host-generic-package)) diff --git a/package/bpftrace/bpftrace.hash b/package/bpftrace/bpftrace.hash index c2ecc927da..a3d62e072f 100644 --- a/package/bpftrace/bpftrace.hash +++ b/package/bpftrace/bpftrace.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 b520340f28ce4d6f2fb2355f1675b6801ff8498ed9e8bff14abbbf6baff5a08e bpftrace-0.19.1.tar.gz +sha256 3b374c3618ff055d279ddd2fcf4393feb88b4b03284b8b6f69f1e0dedd20662c bpftrace-0.23.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/bpftrace/bpftrace.mk b/package/bpftrace/bpftrace.mk index dc4c9728cc..7ff0508486 100644 --- a/package/bpftrace/bpftrace.mk +++ b/package/bpftrace/bpftrace.mk @@ -4,8 +4,8 @@ # ################################################################################ -BPFTRACE_VERSION = 0.19.1 -BPFTRACE_SITE = $(call github,iovisor,bpftrace,v$(BPFTRACE_VERSION)) +BPFTRACE_VERSION = 0.23.3 +BPFTRACE_SITE = $(call github,bpftrace,bpftrace,v$(BPFTRACE_VERSION)) BPFTRACE_LICENSE = Apache-2.0 BPFTRACE_LICENSE_FILES = LICENSE BPFTRACE_DEPENDENCIES = \ diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index a32f2ae716..2a64b5bc46 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/1.5.0/dav1d-1.5.0.tar.xz.sha256 -sha256 14bd6f5157808ed9aedcafbe50df689d304fd4810ac20be6eec1ab037436afd6 dav1d-1.5.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.5.1/dav1d-1.5.1.tar.xz.sha256 +sha256 401813f1f89fa8fd4295805aa5284d9aed9bc7fc1fdbe554af4292f64cbabe21 dav1d-1.5.1.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 7358690b62..c7b5156b21 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.5.0 +DAV1D_VERSION = 1.5.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index 34f6419bf7..a5d80b135d 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.1.0 -sha256 abc307c63853da3199baa5c1e15fd5ede9d68d068b2a59ca14c5a6768e9cc3b7 dhcpcd-10.1.0.tar.xz +# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.2.4 +sha256 6721e606609226dbf4d864a78802a9e96beec0ee034a1bd84138b3e037bba7d9 dhcpcd-10.2.4.tar.xz # Locally calculated -sha256 224b37cd1ef1365bd2ac9eaec9f32fee94e85dd40f95461ebcb21e758357ac1f LICENSE +sha256 3aeab006b01c1573b42d4440d7edad0adfe61ad05848ca82e02e745424a2b4fa LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 3a4b0e10d7..5504914003 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 10.1.0 +DHCPCD_VERSION = 10.2.4 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION) DHCPCD_DEPENDENCIES = host-pkgconf diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index df160a124d..81a3bdd1ff 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,6 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00009.html -sha1 c16a9cf107ad1f0f791b6d00852dc5e961c1c451 diffutils-3.10.tar.xz +# From https://lists.gnu.org/archive/html/info-gnu/2025-04/msg00005.html +sha1 c2f302726d2709c6881c4657430a671abe5eedfa diffutils-3.12.tar.xz # Locally calculated after checking pgp signature -sha256 90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e diffutils-3.10.tar.xz +sha256 7c8b7f9fc8609141fdea9cece85249d308624391ff61dedaf528fcb337727dfd diffutils-3.12.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 1119266863..8ab74ce583 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,13 +4,14 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.10 +DIFFUTILS_VERSION = 3.12 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) DIFFUTILS_LICENSE = GPL-3.0+ DIFFUTILS_LICENSE_FILES = COPYING DIFFUTILS_CPE_ID_VENDOR = gnu +DIFFUTILS_CONF_ENV += gl_cv_func_strcasecmp_works=yes # Since glibc >= 2.26, don't try to use getopt_long replacement bundled # with diffutils. It will conflict with the one from glibc. diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index fee82b00e0..8af32e9239 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 66c07e2f69d8a10fb111b6df27fbe3558734d660207a54391c46eea3e12b29ee esp-hosted-9a2312b0b2630e41bacb3091faaba489cb43b0ab.tar.gz +sha256 1025b8c8d982bab03ebec9859f828a1c81218077245b602621eb4f07c169bac8 ng-v1.0.4.0.0.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 esp_hosted_ng/host/LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 475d32da43..965d3a5cc6 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,8 +4,9 @@ # ################################################################################ -ESP_HOSTED_VERSION = 9a2312b0b2630e41bacb3091faaba489cb43b0ab -ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) +ESP_HOSTED_VERSION = 1.0.4.0.0 +ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,release/ng-v$(ESP_HOSTED_VERSION)) +ESP_HOSTED_SOURCE = ng-v$(ESP_HOSTED_VERSION).tar.gz ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 ESP_HOSTED_LICENSE_FILES = esp_hosted_ng/host/LICENSE diff --git a/package/fluent-bit/0003-lib-miniz-only-require-a-C-compiler.patch b/package/fluent-bit/0003-lib-miniz-only-require-a-C-compiler.patch deleted file mode 100644 index 29c2d9e220..0000000000 --- a/package/fluent-bit/0003-lib-miniz-only-require-a-C-compiler.patch +++ /dev/null @@ -1,31 +0,0 @@ -From abb3b388aaf7ea72ea1fcad77ead52f15a0cf543 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 1 Apr 2025 22:56:00 +0200 -Subject: [PATCH] lib: miniz: only require a C compiler - -Commit https://github.com/richgel999/miniz/commit/05ab4dc05c9d1e1f951f5849b659e2c7e291a620 -"Add some catch2 tests" dropped that C flag, but should instead only have added a simple -enable_language call for the tests only. - -Upstream: https://github.com/richgel999/miniz/commit/383e551cccf41fc2ce1177712d6a37a85d936642 -Signed-off-by: Thomas Devoogdt ---- - lib/miniz/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/miniz/CMakeLists.txt b/lib/miniz/CMakeLists.txt -index 859133ad0..f3d80f80a 100644 ---- a/lib/miniz/CMakeLists.txt -+++ b/lib/miniz/CMakeLists.txt -@@ -7,7 +7,7 @@ if(DEFINED PROJECT_NAME) - endif() - - if(CMAKE_MINOR_VERSION LESS 12) -- project(miniz) -+ project(miniz C) - # see issue https://gitlab.kitware.com/cmake/cmake/merge_requests/1799 - else() - project(miniz C) --- -2.43.0 - diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 71488afd73..aeae034b2a 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -4,12 +4,14 @@ config BR2_PACKAGE_FLUENT_BIT depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_LIBOPENSSL_ENGINES # needed by bundled librdkafka + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_MSGPACK_C select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NGHTTP2 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENGINES # needed by bundled librdkafka - select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZSTD help Fast and Lightweight Logs and Metrics processor. diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 37943c6a4f..ec820416ed 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 aa0577ba7251081c8d5398b2a905b5b0585bb657ca13b39a5e12931437516f08 fluent-bit-4.0.2.tar.gz +sha256 c7d276238d25242467218941842d8cd4df6cfa52cc9379ae5755220cdefd1dc1 fluent-bit-4.0.3.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 23b899e1dd..3e7e04907e 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,14 +4,14 @@ # ################################################################################ -FLUENT_BIT_VERSION = 4.0.2 +FLUENT_BIT_VERSION = 4.0.3 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = c-ares host-bison host-flex libyaml nghttp2 openssl \ - zstd +FLUENT_BIT_DEPENDENCIES = c-ares host-bison host-flex libyaml msgpack-c \ + nghttp2 openssl sqlite zstd FLUENT_BIT_CMAKE_BACKEND = ninja @@ -22,7 +22,9 @@ FLUENT_BIT_CONF_OPTS += \ -DFLB_EXAMPLES=No \ -DFLB_CHUNK_TRACE=No \ -DFLB_PREFER_SYSTEM_LIB_CARES=Yes \ + -DFLB_PREFER_SYSTEM_LIB_MSGPACK=Yes \ -DFLB_PREFER_SYSTEM_LIB_NGHTTP2=Yes \ + -DFLB_PREFER_SYSTEM_LIB_SQLITE=Yes \ -DFLB_PREFER_SYSTEM_LIB_ZSTD=Yes ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 7786cc8009..414aaec7dd 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0f10aca9074c773c12be8a07382c7560d625d4a2c842d82261d18bb8f4b26f6c frr-10.3.tar.gz +sha256 df4bc4f644f93be09f75c0e0e325b2f6a3ee6d1c6db429b6f36874e88a66ee33 frr-10.3.1.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 78979e2beb..23a2ca6037 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 10.3 +FRR_VERSION = 10.3.1 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0+ FRR_LICENSE_FILES = \ diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index b578b96778..3657d87707 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: https://fwts.ubuntu.com/release/SHA256SUMS -sha256 6e4f795a7b5c7e549515901e197fedba200ee9fd06c8a62f9f49db24301f280b fwts-V25.03.00.tar.gz +sha256 06802ac4fed7b6de989417c9726180c77cdc7253d4434b83e43104f4b7f65492 fwts-V25.05.00.tar.gz # Hash for license file sha256 77a5f0ea48e53ee8d67aecc7759cf468bcd340c1caca711ed4307b477a93fb47 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index dd1c16317f..d3ba761982 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 25.03.00 +FWTS_VERSION = 25.05.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 diff --git a/package/gcc-bare-metal/14.2.0 b/package/gcc-bare-metal/14.2.0 deleted file mode 120000 index 0737236850..0000000000 --- a/package/gcc-bare-metal/14.2.0 +++ /dev/null @@ -1 +0,0 @@ -../gcc/14.2.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/15.1.0 b/package/gcc-bare-metal/15.1.0 new file mode 120000 index 0000000000..669da9e956 --- /dev/null +++ b/package/gcc-bare-metal/15.1.0 @@ -0,0 +1 @@ +../gcc/15.1.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index ec245db35b..17232a8ef1 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GCC_BARE_METAL_VERSION = 14.2.0 +GCC_BARE_METAL_VERSION = 15.1.0 GCC_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_BARE_METAL_VERSION) GCC_BARE_METAL_SOURCE = gcc-$(GCC_BARE_METAL_VERSION).tar.xz diff --git a/package/gcc/12.4.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/12.4.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch deleted file mode 100644 index 4bac597233..0000000000 --- a/package/gcc/12.4.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Thu, 29 Sep 2022 15:32:39 +0100 -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS - -This was found when testing buildroot with linuxthreads enabled. In -this case, the build passes --disable-tls to the toolchain during -configuration. After building the OpenRISC toolchain it was still -generating TLS code sequences and causing linker failures such as: - - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' - -This patch fixes this by disabling tls for the OpenRISC target when requested -via --disable-tls. - -gcc/ChangeLog: - - * config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if - HAVE_AS_TLS is defined. - -Tested-by: Yann E. MORIN - -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 - -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/or1k.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc -index da2f59062ba..0ce7b234417 100644 ---- a/gcc/config/or1k/or1k.cc -+++ b/gcc/config/or1k/or1k.cc -@@ -2206,8 +2206,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, - #undef TARGET_LEGITIMATE_ADDRESS_P - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p - -+#ifdef HAVE_AS_TLS - #undef TARGET_HAVE_TLS - #define TARGET_HAVE_TLS true -+#endif - - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed --- -2.39.3 - diff --git a/package/gcc/12.4.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch b/package/gcc/12.4.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch deleted file mode 100644 index 4c79c3448f..0000000000 --- a/package/gcc/12.4.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 38cdfcc4b2cca8d251ff8d8d34201dfe9849333e Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 2 Mar 2023 09:45:41 -0800 -Subject: [PATCH] xtensa: add .note.GNU-stack section on linux - -gcc/ - * config/xtensa/linux.h (TARGET_ASM_FILE_END): New macro. - -libgcc/ - * config/xtensa/crti.S: Add .note.GNU-stack section on linux. - * config/xtensa/crtn.S: Likewise. - * config/xtensa/lib1funcs.S: Likewise. - * config/xtensa/lib2funcs.S: Likewise. - -Signed-off-by: Max Filippov -Signed-off-by: Waldemar Brodkorb -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6360bf9a2d08f08c151464c77c0da53cd702ff25 ---- - gcc/config/xtensa/linux.h | 1 + - libgcc/config/xtensa/crti.S | 6 ++++++ - libgcc/config/xtensa/crtn.S | 6 ++++++ - libgcc/config/xtensa/lib1funcs.S | 6 ++++++ - libgcc/config/xtensa/lib2funcs.S | 6 ++++++ - 5 files changed, 25 insertions(+) - -diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h -index edce618fb94..fe0e3a43797 100644 ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -69,3 +69,4 @@ along with GCC; see the file COPYING3. If not see - - #undef DBX_REGISTER_NUMBER - -+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack -diff --git a/libgcc/config/xtensa/crti.S b/libgcc/config/xtensa/crti.S -index 3de7bc101f4..0996e7cb29b 100644 ---- a/libgcc/config/xtensa/crti.S -+++ b/libgcc/config/xtensa/crti.S -@@ -26,6 +26,12 @@ - - #include "xtensa-config.h" - -+/* An executable stack is *not* required for these functions. */ -+#if defined(__ELF__) && defined(__linux__) -+.section .note.GNU-stack,"",%progbits -+.previous -+#endif -+ - .section .init - .globl _init - .type _init,@function -diff --git a/libgcc/config/xtensa/crtn.S b/libgcc/config/xtensa/crtn.S -index 06b932edb14..a4cc9830096 100644 ---- a/libgcc/config/xtensa/crtn.S -+++ b/libgcc/config/xtensa/crtn.S -@@ -27,6 +27,12 @@ - - #include "xtensa-config.h" - -+/* An executable stack is *not* required for these functions. */ -+#if defined(__ELF__) && defined(__linux__) -+.section .note.GNU-stack,"",%progbits -+.previous -+#endif -+ - .section .init - #if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__ - retw -diff --git a/libgcc/config/xtensa/lib1funcs.S b/libgcc/config/xtensa/lib1funcs.S -index 5a2bd20534f..7177dd4f73a 100644 ---- a/libgcc/config/xtensa/lib1funcs.S -+++ b/libgcc/config/xtensa/lib1funcs.S -@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - - #include "xtensa-config.h" - -+/* An executable stack is *not* required for these functions. */ -+#if defined(__ELF__) && defined(__linux__) -+.section .note.GNU-stack,"",%progbits -+.previous -+#endif -+ - /* Define macros for the ABS and ADDX* instructions to handle cases - where they are not included in the Xtensa processor configuration. */ - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 681bac1be8c..a40c1a45604 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - - #include "xtensa-config.h" - -+/* An executable stack is *not* required for these functions. */ -+#if defined(__ELF__) && defined(__linux__) -+.section .note.GNU-stack,"",%progbits -+.previous -+#endif -+ - /* __xtensa_libgcc_window_spill: This function flushes out all but the - current register window. This is used to set up the stack so that - arbitrary frames can be accessed. */ --- -2.39.2 - diff --git a/package/gcc/12.4.0/0004-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/12.4.0/0004-Remove-crypt-and-crypt_r-interceptors.patch deleted file mode 100644 index de3c27c8c7..0000000000 --- a/package/gcc/12.4.0/0004-Remove-crypt-and-crypt_r-interceptors.patch +++ /dev/null @@ -1,140 +0,0 @@ -From bf61483b6a5e32cb397f97a1cd4af2a41d46ade3 Mon Sep 17 00:00:00 2001 -From: Fangrui Song -Date: Fri, 28 Apr 2023 09:59:17 -0700 -Subject: [PATCH] Remove crypt and crypt_r interceptors - -From Florian Weimer's D144073 - -> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation. -> -> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets. - -Let's remove crypt and crypt_r interceptors (D68431) to fix issues with -newer glibc. - -For older glibc, msan will not know that an uninstrumented crypt_r call -initializes `data`, so there is a risk for false positives. However, with some -codebase survey, I think crypt_r uses are very few and the call sites typically -have a `memset(&data, 0, sizeof(data));` anyway. - -Fix https://github.com/google/sanitizers/issues/1365 -Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432 - -Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka - -Differential Revision: https://reviews.llvm.org/D149403 - -[Thomas: taken from Crosstool-NG] -Upstream: (llvm) https://github.com/llvm/llvm-project/commit/d7bead833631486e337e541e692d9b4a1ca14edd -Upstream: (gcc) https://github.com/gcc-mirror/gcc/commit/d96e14ceb9475f9bccbbc0325d5b11419fad9246 -Signed-off-by: Thomas Petazzoni ---- - .../sanitizer_common_interceptors.inc | 37 ------------------- - .../sanitizer_platform_interceptors.h | 2 - - .../sanitizer_platform_limits_posix.cpp | 2 - - .../sanitizer_platform_limits_posix.h | 1 - - 4 files changed, 42 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc -index abb38ccfa15d..61250226aa56 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc -+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc -@@ -9977,41 +9977,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) { - #define INIT_GETRANDOM - #endif - --#if SANITIZER_INTERCEPT_CRYPT --INTERCEPTOR(char *, crypt, char *key, char *salt) { -- void *ctx; -- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt); -- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); -- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); -- char *res = REAL(crypt)(key, salt); -- if (res != nullptr) -- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); -- return res; --} --#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt); --#else --#define INIT_CRYPT --#endif -- --#if SANITIZER_INTERCEPT_CRYPT_R --INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) { -- void *ctx; -- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data); -- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); -- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); -- char *res = REAL(crypt_r)(key, salt, data); -- if (res != nullptr) { -- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data, -- __sanitizer::struct_crypt_data_sz); -- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); -- } -- return res; --} --#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r); --#else --#define INIT_CRYPT_R --#endif -- - #if SANITIZER_INTERCEPT_GETENTROPY - INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) { - void *ctx; -@@ -10521,8 +10486,6 @@ static void InitializeCommonInterceptors() { - INIT_GETUSERSHELL; - INIT_SL_INIT; - INIT_GETRANDOM; -- INIT_CRYPT; -- INIT_CRYPT_R; - INIT_GETENTROPY; - INIT_QSORT; - INIT_QSORT_R; -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h -index 14610f2df78d..787db66ae2b7 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h -@@ -568,8 +568,6 @@ - #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD - #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID) - #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD) --#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID) --#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID) - - #define SANITIZER_INTERCEPT_GETRANDOM \ - ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD) -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index c335f33dda58..bfdccd5df078 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t; - #include - #include - #include --#include - #endif // SANITIZER_ANDROID - - #include -@@ -254,7 +253,6 @@ namespace __sanitizer { - unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); -- unsigned struct_crypt_data_sz = sizeof(struct crypt_data); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index da53b5abef27..2605bb849a78 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -298,7 +298,6 @@ extern unsigned struct_msqid_ds_sz; - extern unsigned struct_mq_attr_sz; - extern unsigned struct_timex_sz; - extern unsigned struct_statvfs_sz; --extern unsigned struct_crypt_data_sz; - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID - - struct __sanitizer_iovec { --- -2.43.0 - diff --git a/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch deleted file mode 100644 index 386c9287f6..0000000000 --- a/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e45f12ecf703eed45515d451cf014fba32e7410b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 3 Feb 2023 11:48:35 -0800 -Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux - -On 32-bit glibc>=2.34 systems using 64bit time_t build fails because -_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 - -Fixes - -``` -/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed - only with _FILE_OFFSET_BITS=64" -| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" -| ^ -| 1 error generated. -``` - -Reviewed By: thesamesam, MaskRay - -Differential Revision: https://reviews.llvm.org/D140812 - -Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc -Signed-off-by: Thomas Petazzoni ---- - .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index bfdccd5df07..4cedcbfb4bf 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -18,6 +18,7 @@ - // depends on _FILE_OFFSET_BITS setting. - // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. - #undef _FILE_OFFSET_BITS -+#undef _TIME_BITS - #endif - - // Must go after undef _FILE_OFFSET_BITS. --- -2.45.2 - diff --git a/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch deleted file mode 100644 index 80c3378d7b..0000000000 --- a/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 940a0c955bca98aba937c4bfe3fe4a4c17dddb85 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 18 Jul 2024 23:13:41 +0200 -Subject: [PATCH] libsanitizer: also undef _TIME_BITS in - sanitizer_procmaps_solaris.cpp - -Upstream commit -https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 -of LLVM added a #undef _TIME_BITS in -libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to -fix the build on 32-bit Linux platforms that have enabled 64-bit -time_t using _TIME_BITS=64. - -Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but -sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before -including any header file. To fix this, the upstream fix was to also -undef _TIME_BITS. - -This commit simply does the same in sanitizer_procmaps_solaris.cpp, -which also gets compiled under Linux (despite what the file name -says). In practice on Linux hosts (where _TIME_BITS=64 matters), -sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much -the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So -the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here -before including sanitizer_platform.h, which will set the -SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. - -Fixes: - -armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" - 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" - -Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html -Signed-off-by: Thomas Petazzoni ---- - libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp -index e16c4e938cb..ca88cf2c2df 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp -@@ -11,6 +11,7 @@ - - // Before Solaris 11.4, doesn't work in a largefile environment. - #undef _FILE_OFFSET_BITS -+#undef _TIME_BITS - #include "sanitizer_platform.h" - #if SANITIZER_SOLARIS - #include "sanitizer_common.h" --- -2.45.2 - diff --git a/package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/13.4.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/13.4.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/13.3.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch b/package/gcc/13.4.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch similarity index 100% rename from package/gcc/13.3.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch rename to package/gcc/13.4.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch diff --git a/package/gcc/13.3.0/0003-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/13.4.0/0003-Remove-crypt-and-crypt_r-interceptors.patch similarity index 100% rename from package/gcc/13.3.0/0003-Remove-crypt-and-crypt_r-interceptors.patch rename to package/gcc/13.4.0/0003-Remove-crypt-and-crypt_r-interceptors.patch diff --git a/package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch b/package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch deleted file mode 100644 index b6ed2ffed8..0000000000 --- a/package/gcc/14.2.0/0003-libquadmath-Fix-up-libquadmath-math-sqrtq.c-compilat.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ba9356565695728ce0c852f7de3de27f8745611d Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek -Date: Sat, 3 Aug 2024 20:37:54 +0200 -Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in - some powerpc* configurations [PR116007] - -My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation. -Unfortunately, that seems to fail building in some powerpc* configurations, where -TFmode isn't available. -quad.h has: - #ifndef TFtype - typedef float TFtype __attribute__ ((mode (TF))); - #endif -and uses TFtype. quad.h has: - /* Define the complex type corresponding to __float128 - ("_Complex __float128" is not allowed) */ - #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__) - typedef _Complex float __attribute__((mode(TC))) __complex128; - #else - typedef _Complex float __attribute__((mode(KC))) __complex128; - #endif -with the conditional and KCmode use added during porting of libquadmath -to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__ -isn't defined; I could define it to float __attribute__ ((mode (KF))) but it -seemed easier to just define it to __float128 which should do the same thing. - -2024-08-03 Jakub Jelinek - - PR target/116007 - * math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__ - define to __float128 before including soft-fp.h and quad.h. - -(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b) -Upstream: https://gcc.gnu.org/g:3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b -Upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007 -Signed-off-by: Thomas Petazzoni ---- - libquadmath/math/sqrtq.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c -index 8ca2828d42c..a58998a0667 100644 ---- a/libquadmath/math/sqrtq.c -+++ b/libquadmath/math/sqrtq.c -@@ -9,6 +9,9 @@ - && defined(FE_TOWARDZERO) \ - && defined(FE_INEXACT) - #define USE_SOFT_FP 1 -+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__) -+#define TFtype __float128 -+#endif - #include "../../libgcc/soft-fp/soft-fp.h" - #include "../../libgcc/soft-fp/quad.h" - #endif --- -2.46.0 - diff --git a/package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/14.3.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/14.3.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/14.2.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/14.3.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch similarity index 100% rename from package/gcc/14.2.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch rename to package/gcc/14.3.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/15.1.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 91% rename from package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/15.1.0/0001-disable-split-stack-for-non-thread-builds.patch index e801085dad..052c31cf04 100644 --- a/package/gcc/14.2.0/0001-disable-split-stack-for-non-thread-builds.patch +++ b/package/gcc/15.1.0/0001-disable-split-stack-for-non-thread-builds.patch @@ -1,4 +1,4 @@ -From 4f67134e0b1404fef4ea72342be8fab4c37ca8c8 Mon Sep 17 00:00:00 2001 +From d5fe709ddf2ba97ed94ea8339655230322456d1b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 25 Jul 2022 00:29:55 +0200 Subject: [PATCH] disable split-stack for non-thread builds @@ -22,5 +22,5 @@ index cc0366b4cd8..f3f97e86d60 100644 LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c +endif -- -2.34.3 +2.49.0 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 10fe4bf609..5e4da0aa85 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -5,7 +5,7 @@ choice default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_POWERPC_CPU_HAS_SPE - default BR2_GCC_VERSION_13_X + default BR2_GCC_VERSION_14_X help Select the version of gcc you wish to use. @@ -22,16 +22,6 @@ config BR2_GCC_VERSION_POWERPC_SPE depends on BR2_POWERPC_CPU_HAS_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_GCC_VERSION_12_X - bool "gcc 12.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - # powerpc spe support has been deprecated since gcc 8.x. - # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html - depends on !BR2_POWERPC_CPU_HAS_SPE - # ARC HS48 rel 31 only supported by gcc arc fork. - depends on !BR2_archs4x_rel31 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - config BR2_GCC_VERSION_13_X bool "gcc 13.x" # powerpc spe support has been deprecated since gcc 8.x. @@ -49,12 +39,17 @@ config BR2_GCC_VERSION_14_X depends on !BR2_microblaze select BR2_TOOLCHAIN_GCC_AT_LEAST_14 -endchoice +config BR2_GCC_VERSION_15_X + bool "gcc 15.x" + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_POWERPC_CPU_HAS_SPE + # Severely broken on Microblaze + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 + depends on !BR2_microblaze + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 -# libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x -config BR2_GCC_SUPPORTS_LIBCILKRTS - bool - default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 +endchoice config BR2_GCC_SUPPORTS_DLANG bool @@ -76,9 +71,9 @@ config BR2_GCC_SUPPORTS_DLANG config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE - default "12.4.0" if BR2_GCC_VERSION_12_X - default "13.3.0" if BR2_GCC_VERSION_13_X - default "14.2.0" if BR2_GCC_VERSION_14_X + default "13.4.0" if BR2_GCC_VERSION_13_X + default "14.3.0" if BR2_GCC_VERSION_14_X + default "15.1.0" if BR2_GCC_VERSION_15_X default "arc-2023.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS @@ -107,9 +102,8 @@ config BR2_TOOLCHAIN_BUILDROOT_FORTRAN depends on !BR2_TOOLCHAIN_HAS_LIBQUADMATH || \ (BR2_TOOLCHAIN_HAS_LIBQUADMATH && BR2_USE_WCHAR) # internal compiler error: in gen_reg_rtx, at emit-rtl.cc:1167 - # fixed in gcc 14.x, so disable gcc 12.x/13.x - depends on !(BR2_microblaze && \ - (BR2_GCC_VERSION_12_X || BR2_GCC_VERSION_13_X)) + # fixed in gcc 14.x, so disable gcc 13.x + depends on !(BR2_microblaze && BR2_GCC_VERSION_13_X) select BR2_TOOLCHAIN_HAS_FORTRAN help Enable this option if you want your toolchain to support the @@ -134,10 +128,6 @@ config BR2_GCC_ENABLE_OPENMP config BR2_GCC_ENABLE_GRAPHITE bool "Enable graphite support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 help This option enables the graphite optimizations in the compiler. - -comment "graphite support needs gcc >= 5.x" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 99d7047b5f..43aea72420 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -85,25 +85,6 @@ else HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* endif -ifeq ($(BR2_GCC_SUPPORTS_LIBCILKRTS),y) - -# libcilkrts does not support v8 -ifeq ($(BR2_sparc),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts -endif - -# Pthreads are required to build libcilkrts -ifeq ($(BR2_PTHREADS_NONE),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# disable libcilkrts as there is no static version -HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts -endif - -endif # BR2_GCC_SUPPORTS_LIBCILKRTS - # Disable shared libs like libstdc++ if we do static since it confuses linking ifeq ($(BR2_STATIC_LIBS),y) HOST_GCC_FINAL_CONF_OPTS += --disable-shared diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index b7c53f8fbe..692aa31281 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -1,13 +1,11 @@ # From https://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum -sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.4.0/sha512.sum -sha512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 gcc-12.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum -sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.2.0/sha512.sum -sha512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396 gcc-14.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.4.0/sha512.sum +sha512 9b4b83ecf51ef355b868608b8d257b2fa435c06d2719cb86657a7c2c2a0828ff4ce04e9bac1055bbcad8ed5b4da524cafaef654785e23a50233d95d89201e35f gcc-13.4.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.3.0/sha512.sum +sha512 cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93 gcc-14.3.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-15.1.0/sha512.sum +sha512 ddd35ca6c653dffa88f7c7ef9ee4cd806e156e0f3b30f4d63e75a8363361285cd566ee73127734cde6a934611de815bee3e32e24bfd2e0ab9f7ff35c929821c1 gcc-15.1.0.tar.xz # Locally calculated (fetched from Github) sha512 4dca20f517a42bb027fec605965b09fb917a535eebf3fe3e811d93476b02b1962df5ad4665f117bd44c2ec8e8015d51a44c00591761fe5f259c201ac5c7d920f gcc-arc-2023.09-release.tar.gz diff --git a/package/gkrellm/gkrellm.hash b/package/gkrellm/gkrellm.hash index 88624c3366..27ba276efa 100644 --- a/package/gkrellm/gkrellm.hash +++ b/package/gkrellm/gkrellm.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06 gkrellm-2.3.11.tar.bz2 +sha256 6f83665760b936ad4b55f9182b1ec7601faf38a0f25ea1e4bddc9965088f032d gkrellm-2.4.0.tar.bz2 sha256 691de85c3c6eeda5b6982c751548575344739ce4b4418d78905e599359f6c435 COPYING -sha256 b81e0c0c3fb2a58f25377388484a1f729abb367f5f2b43e335a6ed3272ce8536 COPYRIGHT +sha256 a4bb0b604fe7d40ca4469ffd5e2e2de70ff8ece43e47980ab2c8962d5e913330 COPYRIGHT diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 27a87be190..165b71c7c8 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GKRELLM_VERSION = 2.3.11 +GKRELLM_VERSION = 2.4.0 GKRELLM_SITE = http://gkrellm.srcbox.net/releases GKRELLM_SOURCE = gkrellm-$(GKRELLM_VERSION).tar.bz2 GKRELLM_LICENSE = GPL-3.0+ diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch similarity index 100% rename from package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch rename to package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch deleted file mode 100644 index a39f51617b..0000000000 --- a/package/gobject-introspection/0001-disable-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c87faf380ddf44da9d624dabd28178c9065f0f76 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 3 Feb 2020 10:07:15 -0800 -Subject: [PATCH] disable tests - -If introspection data on the host is not built, meson throws the error: -"Unknown variable "typelibs". Because tests are not required, removing -the subdir tests altogether fixes this issue. - -Signed-off-by: Adam Duskett ---- - meson.build | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/meson.build b/meson.build -index c2cb577f..65ce7adf 100644 ---- a/meson.build -+++ b/meson.build -@@ -237,12 +237,6 @@ else - endif - subdir('docs') - --# The tests will also run, which is not possible if they --# were built for a different architecture. --if not meson.is_cross_build() -- subdir('tests') --endif -- - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) - install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) - --- -2.25.1 - diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index c39c06d102..044216c65f 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gobject-introspection/1.82/gobject-introspection-1.82.0.sha256sum -sha256 0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09 gobject-introspection-1.82.0.tar.xz +# From https://download.gnome.org/sources/gobject-introspection/1.84/gobject-introspection-1.84.0.sha256sum +sha256 945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794a84779 gobject-introspection-1.84.0.tar.xz sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL -sha256 fb538e24d22de4f8dab6b48b862be84469bcc089e1cf98f6f46d6f74f6f44655 giscanner/scannerlexer.l +sha256 60cf20b6532aa2f5622f753a55672630b789c04174acca361033e6f1ad29f8ab giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index eb46fb61c1..dbf0ee3fa8 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.82 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.84 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = https://download.gnome.org/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz @@ -40,7 +40,9 @@ GOBJECT_INTROSPECTION_NINJA_ENV += \ # .gir and .typelib files. g-ir-scanner does not use LDFLAGS, and by default, # links to the system-installed libglib2 path. To remedy this issue, defining # LD_LIBRARY_PATH forces g-ir-scanner to use our host installed libglib2 files. -HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ +# As of gobject-introspection version 1.84.0, Meson records the +# LD_LIBRARY_PATH set during config and passes it to g-ir-scanner. +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ LD_LIBRARY_PATH="$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(HOST_DIR)/lib" # Use the host gi-scanner to prevent the scanner from generating incorrect @@ -51,13 +53,16 @@ GOBJECT_INTROSPECTION_CONF_OPTS = \ -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ -Dbuild_introspection_data=true \ -Ddoctool=disabled \ - -Dcairo=disabled + -Dcairo=disabled \ + -Dtests=false + +HOST_GOBJECT_INTROSPECTION_CONF_OPTS = -Dtests=false # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME} GOBJECT_INTROSPECTION_CONF_ENV = \ GI_SCANNER_DISABLE_CACHE=1 -HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ +HOST_GOBJECT_INTROSPECTION_CONF_ENV += \ GI_SCANNER_DISABLE_CACHE=1 # Make sure g-ir-tool-template uses the host python. diff --git a/package/gperf/gperf.hash b/package/gperf/gperf.hash index 1ea48c454b..9615c4e62b 100644 --- a/package/gperf/gperf.hash +++ b/package/gperf/gperf.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz.sig +# https://ftp.gnu.org/pub/gnu/gperf/gperf-3.3.tar.gz.sig # with key 93C08C88471097CD -sha256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz +sha256 fd87e0aba7e43ae054837afd6cd4db03a3f2693deb3619085e6ed9d8d9604ad8 gperf-3.3.tar.gz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index 4b928a0ebd..cf0694f9f8 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPERF_VERSION = 3.1 +GPERF_VERSION = 3.3 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING diff --git a/package/gpsd/0001-Fix-the-logfile-and-dumpfile-options-for-gpsprof.patch b/package/gpsd/0001-Fix-the-logfile-and-dumpfile-options-for-gpsprof.patch new file mode 100644 index 0000000000..d466c9fc58 --- /dev/null +++ b/package/gpsd/0001-Fix-the-logfile-and-dumpfile-options-for-gpsprof.patch @@ -0,0 +1,40 @@ +From f18e52dad4eeba2434a988bc899f6c7fe973f4ba Mon Sep 17 00:00:00 2001 +Message-Id: +From: Richard Lindsley +Date: Fri, 23 May 2025 18:48:57 -0700 +Subject: [PATCH] Fix the --logfile and --dumpfile options for gpsprof + +The open() function requires that the "encoding" argument is a str or +None. + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/bad9973b8e73e9e2cc0af2555edc9c8a0855d203 +Signed-off-by: Yann E. MORIN +--- + clients/gpsprof.py.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/clients/gpsprof.py.in b/clients/gpsprof.py.in +index 8b1a5234b..e5e448a53 100644 +--- a/clients/gpsprof.py.in ++++ b/clients/gpsprof.py.in +@@ -1208,7 +1208,7 @@ if __name__ == '__main__': + options = parser.parse_args() + + if options.logfile: +- options.logfp = open(options.logfile, "w", encoding=ascii) ++ options.logfp = open(options.logfile, "w", encoding="ascii") + else: + options.logfp = None + +@@ -1255,7 +1255,7 @@ if __name__ == '__main__': + plot.postprocess() + # Save the timing data (only) for post-analysis if required. + if options.dumpfile: +- with open(options.dumpfile, "w", encoding=ascii) as fp: ++ with open(options.dumpfile, "w", encoding="ascii") as fp: + fp.write(plot.dump()) + if options.logfp: + options.logfp.close() +-- +2.34.1 + diff --git a/package/gpsd/0002-gpsd-gpsd.c-Fix-empty-gst-in-POLL.patch b/package/gpsd/0002-gpsd-gpsd.c-Fix-empty-gst-in-POLL.patch new file mode 100644 index 0000000000..d07a8970f4 --- /dev/null +++ b/package/gpsd/0002-gpsd-gpsd.c-Fix-empty-gst-in-POLL.patch @@ -0,0 +1,78 @@ +From 98e61729d84b3e3698cde4ec7fe446b932d333fc Mon Sep 17 00:00:00 2001 +Message-Id: <98e61729d84b3e3698cde4ec7fe446b932d333fc.1749533625.git.yann.morin@orange.com> +In-Reply-To: +References: +From: "Gary E. Miller" +Date: Thu, 5 Jun 2025 17:40:56 -0700 +Subject: [PATCH] gpsd/gpsd.c: Fix empty gst[,] in POLL. + +Fix issue 336. + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/3185c5790c3e7e31c6cc80174940f0385cba2617 +Signed-off-by: Yann E. MORIN +--- + gpsd/gpsd.c | 30 ++++++++++++++++++++++-------- + 1 file changed, 22 insertions(+), 8 deletions(-) + +diff --git a/gpsd/gpsd.c b/gpsd/gpsd.c +index 5a98a4470..3797ace13 100644 +--- a/gpsd/gpsd.c ++++ b/gpsd/gpsd.c +@@ -1555,10 +1555,15 @@ static void handle_request(struct subscriber_t *sub, const char *buf, + for (devp = devices; devp < devices + MAX_DEVICES; devp++) { + if (allocated_device(devp) && subscribed(sub, devp)) { + if (0 != (devp->observed & GPS_TYPEMASK)) { ++ size_t rlen = strnlen(reply, replylen); ++ + json_tpv_dump(NAVDATA_SET, devp, &sub->policy, +- reply + strnlen(reply, replylen), +- replylen - strnlen(reply, replylen)); ++ reply + rlen, replylen - rlen); + rstrip(reply, replylen); ++ if (strnlen(reply, replylen) == rlen) { ++ // no data ++ continue; ++ } + (void)strlcat(reply, ",", replylen); + } + } +@@ -1568,10 +1573,15 @@ static void handle_request(struct subscriber_t *sub, const char *buf, + for (devp = devices; devp < devices + MAX_DEVICES; devp++) { + if (allocated_device(devp) && subscribed(sub, devp)) { + if (0 != (devp->observed & GPS_TYPEMASK)) { +- json_noise_dump(&devp->gpsdata, +- reply + strnlen(reply, replylen), +- replylen - strnlen(reply, replylen)); ++ size_t rlen = strnlen(reply, replylen); ++ ++ json_noise_dump(&devp->gpsdata, reply + rlen, ++ replylen - rlen); + rstrip(reply, replylen); ++ if (strnlen(reply, replylen) == rlen) { ++ // no data ++ continue; ++ } + (void)strlcat(reply, ",", replylen); + } + } +@@ -1581,10 +1591,14 @@ static void handle_request(struct subscriber_t *sub, const char *buf, + for (devp = devices; devp < devices + MAX_DEVICES; devp++) { + if (allocated_device(devp) && subscribed(sub, devp)) { + if (0 != (devp->observed & GPS_TYPEMASK)) { +- json_sky_dump(devp, +- reply + strnlen(reply, replylen), +- replylen - strnlen(reply, replylen)); ++ size_t rlen = strnlen(reply, replylen); ++ ++ json_sky_dump(devp, reply + rlen, replylen - rlen); + rstrip(reply, replylen); ++ if (strnlen(reply, replylen) == rlen) { ++ // no data ++ continue; ++ } + (void)strlcat(reply, ",", replylen); + } + } +-- +2.34.1 + diff --git a/package/gpsd/0003-SConscript-Do-not-force-_TIME_BITS-on-a-32-bit-syste.patch b/package/gpsd/0003-SConscript-Do-not-force-_TIME_BITS-on-a-32-bit-syste.patch new file mode 100644 index 0000000000..16a0ca6f88 --- /dev/null +++ b/package/gpsd/0003-SConscript-Do-not-force-_TIME_BITS-on-a-32-bit-syste.patch @@ -0,0 +1,49 @@ +From a1f36cf216861ac6499654b4e6e4d54107142cfc Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: +From: "Gary E. Miller" +Date: Thu, 5 Jun 2025 18:14:55 -0700 +Subject: [PATCH] SConscript: Do not force _TIME_BITS on a 32 bit system. + +The build assumed that if _TIME_BITS existed on a system then it was OK +to set it. Turns out that is a bad assumption. + +Leave it to the builds to decide when _TIME_BITS should be used. + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/95814d22276c34abe72a35b89065b1190d34f9bf +Signed-off-by: Yann E. MORIN +--- + SConscript | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +diff --git a/SConscript b/SConscript +index 28105fa7b..357c53f2b 100644 +--- a/SConscript ++++ b/SConscript +@@ -1335,19 +1335,9 @@ if not cleaning and not helping: + # check for 64 bit time_t. Needed for 2038. + sizeof_time_t = config.CheckTypeSize("time_t", "#include ", + expect=8) +- if 0 == sizeof_time_t: +- # see if we can force time64_t +- # this needs glibc 2.34 or later, and a compatible kernel +- sizeof_time_t = config.CheckTypeSize("time_t", +- "#define _TIME_BITS 64\n" +- "#define _FILE_OFFSET_BITS 64\n" +- "#include ", +- expect=8) +- if 0 != sizeof_time_t: +- # force time64_t +- confdefs.append("// Forcing 64-bit time_t\n" +- "#define _TIME_BITS 64\n" +- "#define _FILE_OFFSET_BITS 64\n") ++ # do not try to force time64_t, that is a distro decision. ++ # it needs glibc 2.34 or later, and a compatible kernel ++ # CFLAGS += "-D_TIME_BITS 64 -D_FILE_OFFSET_BITS 64" + + if 0 == sizeof_time_t: + announce("WARNING: time_t is too small. It will fail in 2038") +-- +2.34.1 + diff --git a/package/gpsd/0004-gpsd-libgpsd_core.c-Make-client-UDP-socket-non-block.patch b/package/gpsd/0004-gpsd-libgpsd_core.c-Make-client-UDP-socket-non-block.patch new file mode 100644 index 0000000000..73ecce5b8b --- /dev/null +++ b/package/gpsd/0004-gpsd-libgpsd_core.c-Make-client-UDP-socket-non-block.patch @@ -0,0 +1,32 @@ +From 0b1769a3abe386c139a8b4d4967b57a00f0f286a Mon Sep 17 00:00:00 2001 +Message-Id: <0b1769a3abe386c139a8b4d4967b57a00f0f286a.1749533625.git.yann.morin@orange.com> +In-Reply-To: +References: +From: Miroslav Lichvar +Date: Tue, 10 Jun 2025 00:21:52 +0200 +Subject: [PATCH] gpsd/libgpsd_core.c: Make client UDP socket non-blocking. + +Resolving issue #337 + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/992a90e6a50b4d3dcb091fff4658e7892c985c7f +Signed-off-by: Yann E. MORIN +--- + gpsd/libgpsd_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gpsd/libgpsd_core.c b/gpsd/libgpsd_core.c +index f328648f7..6b77e2b97 100644 +--- a/gpsd/libgpsd_core.c ++++ b/gpsd/libgpsd_core.c +@@ -614,7 +614,7 @@ int gpsd_open(struct gps_device_t *session) + "CORE: opening UDP feed at %s, port %s.\n", host, + port); + if (0 > (dsock = netlib_connectsock1(AF_UNSPEC, host, port, "udp", +- 0, true, NULL, 0))) { ++ 1, true, NULL, 0))) { + // cast for 32-bit ints. + GPSD_LOG(LOG_ERROR, &session->context->errout, + "CORE: UDP device open error %s(%ld).\n", +-- +2.34.1 + diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index fa4dc7a814..0848f8181a 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -166,26 +166,11 @@ config BR2_PACKAGE_GPSD_NMEA2000 help NMEA2000/CAN support -config BR2_PACKAGE_GPSD_OCEANSERVER - bool "OceanServer" - help - OceanServer Digital Compass support - config BR2_PACKAGE_GPSD_ONCORE bool "OnCore" help OnCore support -config BR2_PACKAGE_GPSD_RTCM104V2 - bool "RTCM104 v2" - help - RTCM104 v2 support - -config BR2_PACKAGE_GPSD_RTCM104V3 - bool "RTCM104 v3" - help - RTCM104 v3 support - config BR2_PACKAGE_GPSD_SIRF bool "SiRF" help @@ -216,11 +201,6 @@ config BR2_PACKAGE_GPSD_TRUE_NORTH help True North Technologies support -config BR2_PACKAGE_GPSD_UBX - bool "UBX" - help - uBlox UBX binary support - endif # GPSD_DAEMON config BR2_PACKAGE_GPSD_CLIENTS diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index 15e1181ed9..984ddab125 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz +sha256 dc7e465968c1540e61bc57c7586d6a57a0047212a014efdad348f907bc2e0990 gpsd-3.26.1.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 8f87766dcc..1b20210c49 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.25 +GPSD_VERSION = 3.26.1 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING @@ -120,18 +120,9 @@ endif ifneq ($(BR2_PACKAGE_GPSD_NMEA2000),y) GPSD_SCONS_OPTS += nmea2000=no endif -ifneq ($(BR2_PACKAGE_GPSD_OCEANSERVER),y) -GPSD_SCONS_OPTS += oceanserver=no -endif ifneq ($(BR2_PACKAGE_GPSD_ONCORE),y) GPSD_SCONS_OPTS += oncore=no endif -ifneq ($(BR2_PACKAGE_GPSD_RTCM104V2),y) -GPSD_SCONS_OPTS += rtcm104v2=no -endif -ifneq ($(BR2_PACKAGE_GPSD_RTCM104V3),y) -GPSD_SCONS_OPTS += rtcm104v3=no -endif ifneq ($(BR2_PACKAGE_GPSD_SIRF),y) GPSD_SCONS_OPTS += sirf=no endif @@ -150,9 +141,6 @@ endif ifneq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y) GPSD_SCONS_OPTS += tnt=no endif -ifneq ($(BR2_PACKAGE_GPSD_UBX),y) -GPSD_SCONS_OPTS += ublox=no -endif # Features ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) diff --git a/package/grep/grep.hash b/package/grep/grep.hash index a0028a4e2f..fdc1505e36 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# https://ftp.gnu.org/gnu/grep/grep-3.11.tar.xz.sig +# https://ftp.gnu.org/gnu/grep/grep-3.12.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab grep-3.11.tar.xz +sha256 2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9 grep-3.12.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 61900bb957..9dff26bafa 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 3.11 +GREP_VERSION = 3.12 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 74390c2ff5..42f340fa80 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz.sha256 -sha256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd haproxy-2.6.15.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.22.tar.gz.sha256 +sha256 4c0797f450f997dc287d2c7aafa7a0e5b7a2d71593a2cd58e664e8f3aea614fa haproxy-2.6.22.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 61a9ebebe4..77195d966b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).15 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).22 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt diff --git a/package/hidapi/hidapi.hash b/package/hidapi/hidapi.hash index cc2d13214d..7344d55397 100644 --- a/package/hidapi/hidapi.hash +++ b/package/hidapi/hidapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd hidapi-0.14.0.tar.gz +sha256 5d84dec684c27b97b921d2f3b73218cb773cf4ea915caee317ac8fc73cef8136 hidapi-0.15.0.tar.gz sha256 7d3b087c34f35d4d538e3bcddd1ff8f66e92f9ef336881999482800ddf840913 LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-gpl3.txt sha256 30eb1bef29b46f8ba7ab8b416035dbd93cb034a45481dd97815b944284582cd2 LICENSE-bsd.txt diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk index 9f5c0a3df2..c4daf934ee 100644 --- a/package/hidapi/hidapi.mk +++ b/package/hidapi/hidapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIDAPI_VERSION = 0.14.0 +HIDAPI_VERSION = 0.15.0 HIDAPI_SITE = $(call github,libusb,hidapi,hidapi-$(HIDAPI_VERSION)) HIDAPI_INSTALL_STAGING = YES # No configure provided, so we need to autoreconf. diff --git a/package/htop/htop.hash b/package/htop/htop.hash index 3e45e1a21a..0750ab0098 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,5 +1,5 @@ -# From https://github.com/htop-dev/htop/releases/download/3.3.0/htop-3.3.0.tar.xz.sha256 -sha256 a69acf9b42ff592c4861010fce7d8006805f0d6ef0e8ee647a6ee6e59b743d5c htop-3.3.0.tar.xz +# From https://github.com/htop-dev/htop/releases/download/3.4.1/htop-3.4.1.tar.xz.sha256 +sha256 904f7d4580fc11cffc7e0f06895a4789e0c1c054435752c151e812fead9f6220 htop-3.4.1.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 4fa8e4fb5f..55e3b9d57c 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 3.3.0 +HTOP_VERSION = 3.4.1 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 8eb0597a98..59a3286c1c 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1166f733c57afa82cfdad56e62ef044835fbc8c99ef65f033e6a5802716b5c66 hwdata-0.395.tar.gz +sha256 6ed6ff6eb9d137b9669af6966974643a015cf302a39237ef84dd2efa5e20bae8 hwdata-0.396.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 4de227b650..f21db41e27 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.395 +HWDATA_VERSION = 0.396 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/iftop/0003-iftop-function-args.patch b/package/iftop/0003-iftop-function-args.patch new file mode 100644 index 0000000000..7ef38bf0bb --- /dev/null +++ b/package/iftop/0003-iftop-function-args.patch @@ -0,0 +1,18 @@ +Fix gcc-15.x build + +Upstream: https://src.fedoraproject.org/rpms/iftop/c/d098f91f0f590c1cab264bf77851d4018c430d9f?branch=rawhide + +Signed-off-by: Bernd Kuhls + +diff -up iftop-1.0pre4/cfgfile.h.fargs iftop-1.0pre4/cfgfile.h +--- iftop-1.0pre4/cfgfile.h.fargs 2014-01-05 19:47:53.000000000 +0100 ++++ iftop-1.0pre4/cfgfile.h 2025-05-15 18:09:05.849754901 +0200 +@@ -13,7 +13,7 @@ typedef struct { + int value; + } config_enumeration_type; + +-int read_config(); ++int read_config(char *f, int whinge); + + char *config_get_string(const char *directive); + int config_get_bool(const char *directive); diff --git a/package/iproute2/0001-nstat-NULL-Dereference-when-no-entries-specified.patch b/package/iproute2/0001-nstat-NULL-Dereference-when-no-entries-specified.patch deleted file mode 100644 index 9b5e727fe3..0000000000 --- a/package/iproute2/0001-nstat-NULL-Dereference-when-no-entries-specified.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 866e1d107b7de68ca1fcd1d4d5ffecf9d96bff30 Mon Sep 17 00:00:00 2001 -From: ZiAo Li <23110240084@m.fudan.edu.cn> -Date: Wed, 9 Apr 2025 23:03:30 +0800 -Subject: [PATCH] nstat: NULL Dereference when no entries specified - -The NULL Pointer Dereference vulnerability happens in load_ugly_table(), misc/nstat.c, in the latest version of iproute2. -The vulnerability can be triggered by: -1. db is set to NULL at struct nstat_ent *db = NULL; -2. n is set to NULL at n = db; -3. NULL dereference of variable n happens at sscanf(p+1, "%llu", &n->val) != 1 - -Signed-off-by: ZiAo Li <23110240084@m.fudan.edu.cn> -Signed-off-by: Stephen Hemminger -Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=866e1d107b7de68ca1fcd1d4d5ffecf9d96bff30 ---- - misc/nstat.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/misc/nstat.c b/misc/nstat.c -index fce3e9c1..b2e19bde 100644 ---- a/misc/nstat.c -+++ b/misc/nstat.c -@@ -218,6 +218,10 @@ static void load_ugly_table(FILE *fp) - p = next; - } - n = db; -+ if (n == NULL) { -+ fprintf(stderr, "Error: Invalid input – line has ':' but no entries. Add values after ':'.\n"); -+ exit(-2); -+ } - nread = getline(&buf, &buflen, fp); - if (nread == -1) { - fprintf(stderr, "%s:%d: error parsing history file\n", --- -2.49.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index d64ff918c6..69de2917cf 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f iproute2-6.14.0.tar.xz +sha256 8041854a882583ad5263466736c9c8c68c74b1a35754ab770d23343f947528fb iproute2-6.15.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 3faa2235b8..e3076a59a8 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.14.0 +IPROUTE2_VERSION = 6.15.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ diff --git a/package/libde265/libde265.hash b/package/libde265/libde265.hash index a21a8a1265..efd48d13aa 100644 --- a/package/libde265/libde265.hash +++ b/package/libde265/libde265.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00251986c29d34d3af7117ed05874950c875dd9292d016be29d3b3762666511d libde265-1.0.15.tar.gz +sha256 b92beb6b53c346db9a8fae968d686ab706240099cdd5aff87777362d668b0de7 libde265-1.0.16.tar.gz sha256 02cc1585a20677992e0ba578fa692635dc193735f2691dc81de924b51c4e8020 COPYING diff --git a/package/libde265/libde265.mk b/package/libde265/libde265.mk index 62c22246aa..3d9b96134f 100644 --- a/package/libde265/libde265.mk +++ b/package/libde265/libde265.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDE265_VERSION = 1.0.15 +LIBDE265_VERSION = 1.0.16 LIBDE265_SITE = https://github.com/strukturag/libde265/releases/download/v$(LIBDE265_VERSION) LIBDE265_LICENSE = LGPL-3.0+ LIBDE265_LICENSE_FILES = COPYING diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 3f11309750..8c9b210581 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 75b27d4d6df44bd34e2f70663cfd998f5ec41e680e1e593238bbe517a84c7ed2 libgit2-1.9.0.tar.gz +sha256 14cab3014b2b7ad75970ff4548e83615f74d719afe00aa479b4a889c1e13fc00 libgit2-1.9.1.tar.gz sha256 e3712465634e97cfd850822a4eb5ac7d2f8a10f753189366d5a2060046f28288 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 4026ac1f7c..f615484edb 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.9.0 +LIBGIT2_VERSION = 1.9.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 03e91e4212..00bc5baa45 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_111_RTM/src/SHA256SUMS -sha256 5a4d5a44e91ef03cdc0c4897cf616e3c92f4e590ea835d3e0ccad8b005bd73c6 nss-3.111.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_112_RTM/src/SHA256SUMS +sha256 33ae72d43b275957252adc8639e84229d3ae692a57b6191b059d9456b8568a68 nss-3.112.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2cab84abc..ddfed19a29 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.111 +LIBNSS_VERSION = 3.112 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/libnvme/0001-Make-examples-build-selectable.patch b/package/libnvme/0001-Make-examples-build-selectable.patch new file mode 100644 index 0000000000..d3f59a3240 --- /dev/null +++ b/package/libnvme/0001-Make-examples-build-selectable.patch @@ -0,0 +1,46 @@ +From 6c0b9ad7822d9e9c74b787914cb766d27a358258 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 20 May 2025 22:34:16 +0200 +Subject: [PATCH] Make examples build selectable + +Sometimes we don't need to build examples and increase some dependency we +don't have(i.e. bits/pthreadtypes.h in musl) so let's add examples option +true by default. + +Upstream: https://github.com/linux-nvme/libnvme/pull/1014 +Signed-off-by: Giulio Benetti +--- + meson.build | 4 +++- + meson_options.txt | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 279245ac..4d819178 100644 +--- a/meson.build ++++ b/meson.build +@@ -282,7 +282,9 @@ subdir('libnvme') + if get_option('tests') + subdir('test') + endif +-subdir('examples') ++if get_option('examples') ++ subdir('examples') ++endif + subdir('doc') + + ################################################################################ +diff --git a/meson_options.txt b/meson_options.txt +index 051b4ae5..48a93dae 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -6,6 +6,7 @@ option('rstdir', type : 'string', value : '', description : 'directory for ReST + + option('docs', type : 'combo', choices : ['false', 'html', 'man', 'rst', 'all'], description : 'install documentation') + option('docs-build', type : 'boolean', value : false, description : 'build documentation') ++option('examples', type : 'boolean', value : true, description : 'build examples') + option('tests', type : 'boolean', value : true, description : 'build tests') + + option('python', type : 'feature', value: 'auto', description : 'Generate libnvme python bindings') +-- +2.39.5 + diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 9496401c61..ae2c478ebc 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 f083c21f525644a2bcca6d367d96fab813de880cba9f1746a850f3a8692a5980 libnvme-1.13.tar.gz +sha256 a7230d6d4959f26cf0c0ef6c9bb479bd94a8c0ec738bf6e164d66c3dc6397e66 libnvme-1.14.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index 8184c9d0a2..b69e9257cf 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBNVME_VERSION = 1.13 +LIBNVME_VERSION = 1.14 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING LIBNVME_INSTALL_STAGING = YES LIBNVME_CONF_OPTS += \ + -Dexamples=false \ -Dtests=false ifeq ($(BR2_PACKAGE_PYTHON3),y) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index 3fae82b5e7..7e5b33149c 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.46/ -sha1 11423f5ea270e7bb42dd2d519696adcd016d5df3 libpng-1.6.46.tar.xz +# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.48/ +sha1 132bfa1a68e3d8f741d0b3fe03809e181fe57b7d libpng-1.6.48.tar.xz # Locally computed: -sha256 f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1 libpng-1.6.46.tar.xz +sha256 46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03 libpng-1.6.48.tar.xz sha256 16d9daaafbf63a31a5bdc91d4600972548fef5aaa1244202393288dbd079c49a LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index e73e0bb686..e215d70f7f 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.46 +LIBPNG_VERSION = 1.6.48 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) diff --git a/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch b/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch deleted file mode 100644 index 3cac133864..0000000000 --- a/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 1153ebdeba563ac657b525edd6bf6da68b1fe5e2 Mon Sep 17 00:00:00 2001 -From: Viktor Szakats -Date: Tue, 30 May 2023 17:28:03 +0000 -Subject: [PATCH] mbedtls: use more `size_t` to sync up with `crypto.h` - -Ref: 5a96f494ee0b00282afb2db2e091246fc5e1774a #846 #879 - -Fixes #1053 -Closes #1054 - -Upstream: https://github.com/libssh2/libssh2/commit/1153ebdeba563ac657b525edd6bf6da68b1fe5e2 - -Signed-off-by: Bernd Kuhls ---- - src/mbedtls.c | 14 ++++++++------ - src/mbedtls.h | 13 ++++++------- - 2 files changed, 14 insertions(+), 13 deletions(-) - -diff --git a/src/mbedtls.c b/src/mbedtls.c -index e387cdb19..cd14a4bd8 100644 ---- a/src/mbedtls.c -+++ b/src/mbedtls.c -@@ -186,7 +186,7 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx) - int - _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, - mbedtls_md_type_t mdtype, -- const unsigned char *key, unsigned long keylen) -+ const unsigned char *key, size_t keylen) - { - const mbedtls_md_info_t *md_info; - int ret, hmac; -@@ -221,7 +221,7 @@ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash) - } - - int --_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, -+_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, - mbedtls_md_type_t mdtype, unsigned char *hash) - { - const mbedtls_md_info_t *md_info; -@@ -497,8 +497,9 @@ int - _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, - size_t hash_len, - const unsigned char *sig, -- unsigned long sig_len, -- const unsigned char *m, unsigned long m_len) -+ size_t sig_len, -+ const unsigned char *m, -+ size_t m_len) - { - int ret; - int md_type; -@@ -548,8 +549,9 @@ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, - int - _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx * rsactx, - const unsigned char *sig, -- unsigned long sig_len, -- const unsigned char *m, unsigned long m_len) -+ size_t sig_len, -+ const unsigned char *m, -+ size_t m_len) - { - return _libssh2_mbedtls_rsa_sha2_verify(rsactx, SHA_DIGEST_LENGTH, - sig, sig_len, m, m_len); -diff --git a/src/mbedtls.h b/src/mbedtls.h -index d9592f721..03484da17 100644 ---- a/src/mbedtls.h -+++ b/src/mbedtls.h -@@ -478,12 +478,12 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx); - int - _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, - mbedtls_md_type_t mdtype, -- const unsigned char *key, unsigned long keylen); -+ const unsigned char *key, size_t keylen); - - int - _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash); - int --_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, -+_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, - mbedtls_md_type_t mdtype, unsigned char *hash); - - _libssh2_bn * -@@ -526,9 +526,8 @@ _libssh2_mbedtls_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa, - int - _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx *rsa, - const unsigned char *sig, -- unsigned long sig_len, -- const unsigned char *m, -- unsigned long m_len); -+ size_t sig_len, -+ const unsigned char *m, size_t m_len); - int - _libssh2_mbedtls_rsa_sha1_sign(LIBSSH2_SESSION *session, - libssh2_rsa_ctx *rsa, -@@ -540,8 +539,8 @@ int - _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, - size_t hash_len, - const unsigned char *sig, -- unsigned long sig_len, -- const unsigned char *m, unsigned long m_len); -+ size_t sig_len, -+ const unsigned char *m, size_t m_len); - int - _libssh2_mbedtls_rsa_sha2_sign(LIBSSH2_SESSION *session, - libssh2_rsa_ctx *rsa, diff --git a/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch deleted file mode 100644 index 8187719477..0000000000 --- a/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch +++ /dev/null @@ -1,467 +0,0 @@ -From 3a80751dce7b7d98b9d9006fb37213a1e4af7ac5 Mon Sep 17 00:00:00 2001 -From: Michael Buckley -Date: Thu, 30 Nov 2023 15:08:02 -0800 -Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" - -Refs: -https://terrapin-attack.com/ -https://seclists.org/oss-sec/2023/q4/292 -https://osv.dev/list?ecosystem=&q=CVE-2023-48795 -https://github.com/advisories/GHSA-45x7-px36-x8w8 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 - -Fixes #1290 -Closes #1291 - -Upstream: https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a -Signed-off-by: Fabrice Fontaine -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/kex.c | 63 +++++++++++++++++++++++------------ - src/libssh2_priv.h | 18 +++++++--- - src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- - src/packet.h | 2 +- - src/session.c | 3 ++ - src/transport.c | 12 ++++++- - 6 files changed, 149 insertions(+), 32 deletions(-) - -diff --git a/src/kex.c b/src/kex.c -index d4034a0a953e..b4b748cac4ee 100644 ---- a/src/kex.c -+++ b/src/kex.c -@@ -3037,6 +3037,13 @@ kex_method_extension_negotiation = { - 0, - }; - -+static const LIBSSH2_KEX_METHOD -+kex_method_strict_client_extension = { -+ "kex-strict-c-v00@openssh.com", -+ NULL, -+ 0, -+}; -+ - static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - #if LIBSSH2_ED25519 - &kex_method_ssh_curve25519_sha256, -@@ -3055,6 +3062,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - &kex_method_diffie_helman_group1_sha1, - &kex_method_diffie_helman_group_exchange_sha1, - &kex_method_extension_negotiation, -+ &kex_method_strict_client_extension, - NULL - }; - -@@ -3307,13 +3315,13 @@ static int kexinit(LIBSSH2_SESSION * session) - return 0; - } - --/* kex_agree_instr -+/* _libssh2_kex_agree_instr - * Kex specific variant of strstr() - * Needle must be preceded by BOL or ',', and followed by ',' or EOL - */ --static unsigned char * --kex_agree_instr(unsigned char *haystack, size_t haystack_len, -- const unsigned char *needle, size_t needle_len) -+unsigned char * -+_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, -+ const unsigned char *needle, size_t needle_len) - { - unsigned char *s; - unsigned char *end_haystack; -@@ -3398,7 +3406,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - while(s && *s) { - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { - const LIBSSH2_HOSTKEY_METHOD *method = - (const LIBSSH2_HOSTKEY_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3432,9 +3440,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - } - - while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { -- s = kex_agree_instr(hostkey, hostkey_len, -- (unsigned char *) (*hostkeyp)->name, -- strlen((*hostkeyp)->name)); -+ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, -+ (unsigned char *) (*hostkeyp)->name, -+ strlen((*hostkeyp)->name)); - if(s) { - /* So far so good, but does it suit our purposes? (Encrypting vs - Signing) */ -@@ -3468,6 +3476,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - { - const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; - unsigned char *s; -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ -+ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { -+ session->kex_strict = 1; -+ } - - if(session->kex_prefs) { - s = (unsigned char *) session->kex_prefs; -@@ -3475,7 +3489,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - while(s && *s) { - unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- q = kex_agree_instr(kex, kex_len, s, method_len); -+ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); - if(q) { - const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3509,9 +3523,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - } - - while(*kexp && (*kexp)->name) { -- s = kex_agree_instr(kex, kex_len, -- (unsigned char *) (*kexp)->name, -- strlen((*kexp)->name)); -+ s = _libssh2_kex_agree_instr(kex, kex_len, -+ (unsigned char *) (*kexp)->name, -+ strlen((*kexp)->name)); - if(s) { - /* We've agreed on a key exchange method, - * Can we agree on a hostkey that works with this kex? -@@ -3555,7 +3569,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { - const LIBSSH2_CRYPT_METHOD *method = - (const LIBSSH2_CRYPT_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3577,9 +3591,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - } - - while(*cryptp && (*cryptp)->name) { -- s = kex_agree_instr(crypt, crypt_len, -- (unsigned char *) (*cryptp)->name, -- strlen((*cryptp)->name)); -+ s = _libssh2_kex_agree_instr(crypt, crypt_len, -+ (unsigned char *) (*cryptp)->name, -+ strlen((*cryptp)->name)); - if(s) { - endpoint->crypt = *cryptp; - return 0; -@@ -3619,7 +3633,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(mac, mac_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { - const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) - kex_get_method_by_name((char *) s, method_len, - (const LIBSSH2_COMMON_METHOD **) -@@ -3640,8 +3654,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - } - - while(*macp && (*macp)->name) { -- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, -- strlen((*macp)->name)); -+ s = _libssh2_kex_agree_instr(mac, mac_len, -+ (unsigned char *) (*macp)->name, -+ strlen((*macp)->name)); - if(s) { - endpoint->mac = *macp; - return 0; -@@ -3672,7 +3687,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(comp, comp_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { - const LIBSSH2_COMP_METHOD *method = - (const LIBSSH2_COMP_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3694,8 +3709,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - } - - while(*compp && (*compp)->name) { -- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, -- strlen((*compp)->name)); -+ s = _libssh2_kex_agree_instr(comp, comp_len, -+ (unsigned char *) (*compp)->name, -+ strlen((*compp)->name)); - if(s) { - endpoint->comp = *compp; - return 0; -@@ -3876,6 +3892,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3901,6 +3918,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3949,6 +3967,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->remote.kexinit = NULL; - } - -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - -diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h -index 82c3afe250b0..ee1d8b5c2b9b 100644 ---- a/src/libssh2_priv.h -+++ b/src/libssh2_priv.h -@@ -699,6 +699,9 @@ struct _LIBSSH2_SESSION - /* key signing algorithm preferences -- NULL yields server order */ - char *sign_algo_prefs; - -+ /* Whether to use the OpenSSH Strict KEX extension */ -+ int kex_strict; -+ - /* (remote as source of data -- packet_read ) */ - libssh2_endpoint_data remote; - -@@ -870,6 +873,7 @@ struct _LIBSSH2_SESSION - int fullpacket_macstate; - size_t fullpacket_payload_len; - int fullpacket_packet_type; -+ uint32_t fullpacket_required_type; - - /* State variables used in libssh2_sftp_init() */ - libssh2_nonblocking_states sftpInit_state; -@@ -910,10 +914,11 @@ struct _LIBSSH2_SESSION - }; - - /* session.state bits */ --#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 --#define LIBSSH2_STATE_NEWKEYS 0x00000002 --#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 --#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 -+#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 -+#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 -+#define LIBSSH2_STATE_NEWKEYS 0x00000004 -+#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 -+#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 - - /* session.flag helpers */ - #ifdef MSG_NOSIGNAL -@@ -1144,6 +1149,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, - int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - key_exchange_state_t * state); - -+unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, -+ size_t haystack_len, -+ const unsigned char *needle, -+ size_t needle_len); -+ - /* Let crypt.c/hostkey.c expose their method structs */ - const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); - const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); -diff --git a/src/packet.c b/src/packet.c -index b5b41981a108..35d4d39eff87 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -605,14 +605,13 @@ authagent_exit: - * layer when it has received a packet. - * - * The input pointer 'data' is pointing to allocated data that this function -- * is asked to deal with so on failure OR success, it must be freed fine. -- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. -+ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. - * - * This function will always be called with 'datalen' greater than zero. - */ - int - _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate) -+ size_t datalen, int macstate, uint32_t seq) - { - int rc = 0; - unsigned char *message = NULL; -@@ -657,6 +656,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - break; - } - -+ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { -+ if(msg == SSH_MSG_KEXINIT) { -+ if(!session->kex_strict) { -+ if(datalen < 17) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Data too short extracting kex"); -+ } -+ else { -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ struct string_buf buf; -+ unsigned char *algs = NULL; -+ size_t algs_len = 0; -+ -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 17; /* advance past type and cookie */ -+ -+ if(_libssh2_get_string(&buf, &algs, &algs_len)) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Algs too short"); -+ } -+ -+ if(algs_len == 0 || -+ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { -+ session->kex_strict = 1; -+ } -+ } -+ } -+ -+ if(session->kex_strict && seq) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ } -+ } -+ -+ if(session->kex_strict && session->fullpacket_required_type && -+ session->fullpacket_required_type != msg) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } -+ } -+ - if(session->packAdd_state == libssh2_NB_state_allocated) { - /* A couple exceptions to the packet adding rule: */ - switch(msg) { -@@ -1341,6 +1404,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, - - return 0; - } -+ else if(session->kex_strict && -+ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } - packet = _libssh2_list_next(&packet->node); - } - return -1; -@@ -1402,7 +1474,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, - } - - while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { -- int ret = _libssh2_transport_read(session); -+ int ret; -+ session->fullpacket_required_type = packet_type; -+ ret = _libssh2_transport_read(session); -+ session->fullpacket_required_type = 0; - if(ret == LIBSSH2_ERROR_EAGAIN) - return ret; - else if(ret < 0) { -diff --git a/src/packet.h b/src/packet.h -index 79018bcf1d55..6ea100a5cfb3 100644 ---- a/src/packet.h -+++ b/src/packet.h -@@ -71,6 +71,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, - int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, - unsigned long data_len); - int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate); -+ size_t datalen, int macstate, uint32_t seq); - - #endif /* __LIBSSH2_PACKET_H */ -diff --git a/src/session.c b/src/session.c -index a4d602bad002..f4bafb57b2a6 100644 ---- a/src/session.c -+++ b/src/session.c -@@ -464,6 +464,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), - session->abstract = abstract; - session->api_timeout = 0; /* timeout-free API by default */ - session->api_block_mode = 1; /* blocking API by default */ -+ session->state = LIBSSH2_STATE_INITIAL_KEX; -+ session->fullpacket_required_type = 0; - session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; - session->flag.quote_paths = 1; /* default behavior is to quote paths - for the scp subsystem */ -@@ -1186,6 +1188,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, - const char *desc, const char *lang) - { - int rc; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - BLOCK_ADJUST(rc, session, - session_disconnect(session, reason, desc, lang)); -diff --git a/src/transport.c b/src/transport.c -index 6d902d3372b4..3b30ff848726 100644 ---- a/src/transport.c -+++ b/src/transport.c -@@ -187,6 +187,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - struct transportpacket *p = &session->packet; - int rc; - int compressed; -+ uint32_t seq = session->remote.seqno; - - if(session->fullpacket_state == libssh2_NB_state_idle) { - session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; -@@ -318,7 +319,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - if(session->fullpacket_state == libssh2_NB_state_created) { - rc = _libssh2_packet_add(session, p->payload, - session->fullpacket_payload_len, -- session->fullpacket_macstate); -+ session->fullpacket_macstate, seq); - if(rc == LIBSSH2_ERROR_EAGAIN) - return rc; - if(rc) { -@@ -329,6 +330,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - - session->fullpacket_state = libssh2_NB_state_idle; - -+ if(session->kex_strict && -+ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { -+ session->remote.seqno = 0; -+ } -+ - return session->fullpacket_packet_type; - } - -@@ -1091,6 +1097,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, - - session->local.seqno++; - -+ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { -+ session->local.seqno = 0; -+ } -+ - ret = LIBSSH2_SEND(session, p->outbuf, total_length, - LIBSSH2_SOCKET_SEND_FLAGS(session)); - if(ret < 0) --- -2.43.0 - diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash index b5bc571f86..bf04c5acab 100644 --- a/package/libssh2/libssh2.hash +++ b/package/libssh2/libssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a488a22625296342ddae862de1d59633e6d446eff8417398e06674a49be3d7c2 libssh2-1.11.0.tar.xz -sha256 fda5e2522c58ba1f31c9f2044747616457466f4aebec16ade4af86e3a16a8e02 COPYING +sha256 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769 libssh2-1.11.1.tar.xz +sha256 f7f9633cf9ff2f1333f3d7ce46973a8716a4d2a2815ad56f30d437d5fea7bafe COPYING diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index b2c07cbf30..1702d94c79 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSSH2_VERSION = 1.11.0 +LIBSSH2_VERSION = 1.11.1 LIBSSH2_SOURCE= libssh2-$(LIBSSH2_VERSION).tar.xz LIBSSH2_SITE = https://www.libssh2.org/download LIBSSH2_LICENSE = BSD @@ -13,9 +13,6 @@ LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build --disable-rpath -# 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch -LIBSSH2_IGNORE_CVES += CVE-2023-48795 - ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) LIBSSH2_DEPENDENCIES += mbedtls LIBSSH2_CONF_OPTS += --with-libmbedcrypto-prefix=$(STAGING_DIR)/usr \ diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 3d51244b2c..4c76609930 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 966bb0d231f94a474eaae2e67da5ec844d3527a1f386456394ff432580634b29 libusb-1.0.28.tar.bz2 +sha256 5977fc950f8d1395ccea9bd48c06b3f808fd3c2c961b44b0c2e6e29fc3a70a85 libusb-1.0.29.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 3d809bfb6e..95ce8b17df 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).28 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).29 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ diff --git a/package/libusbgx/libusbgx.hash b/package/libusbgx/libusbgx.hash index b18258978f..724da27a57 100644 --- a/package/libusbgx/libusbgx.hash +++ b/package/libusbgx/libusbgx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d0b483d8b190a75a1f9b52d6db229de5580c78b201077361a524cf32c5aad517 libusbgx-a5bfa81017a9b2064bc449cf74f5f9d106445f62.tar.gz +sha256 23d72c415ffd80d752efccc9bb5a6afdece6a83a31975344ef31a4967d189e3c libusbgx-0.3.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk index 03e8dff6bb..7a0e4c5e5b 100644 --- a/package/libusbgx/libusbgx.mk +++ b/package/libusbgx/libusbgx.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUSBGX_VERSION = a5bfa81017a9b2064bc449cf74f5f9d106445f62 -LIBUSBGX_SITE = $(call github,linux-usb-gadgets,libusbgx,$(LIBUSBGX_VERSION)) +LIBUSBGX_VERSION = 0.3.0 +LIBUSBGX_SITE = $(call github,linux-usb-gadgets,libusbgx,libusbgx-v$(LIBUSBGX_VERSION)) LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index eb86aec00b..07f3d7b31a 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 b1083a36f19aea46f661dcfd4cd462d13933dcb4e7f0dc809525552dd5c3541d linux-firmware-20250311.tar.xz +sha256 f2c60d66f226a28130cb5643e6e544d3229673460e127c91ba03f1080cbd703e linux-firmware-20250509.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -41,7 +41,7 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 ed8d8c55a57ac653df71ed07c278b4ae2b82e39e4bbde548bb140fd663720cbe WHENCE +sha256 476379d7f25204d2a5987ecd614fd0fadaa9d64775c926f067461fdfdff9b0c9 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 sha256 26b3c946f1f378ff25bb3bb7c365d108a2bc0bf08619e5e08bc0e4f9aaa6ee1e LICENSE.xe diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index cfce1707d7..07d7fe4ea1 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20250311 +LINUX_FIRMWARE_VERSION = 20250509 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES diff --git a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch deleted file mode 100644 index ffdd5d187f..0000000000 --- a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 5 Aug 2019 16:06:48 +0200 -Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set - of prefixes for searching the gcc toolchain - -By default, the Gnu Toolchains driver is looking at the parent -directory while looking for the gcc toolchain when clang is installed -at "D.InstalledDir" - -But this doesn't work with Buildroot since the external -toolchain is installed in host/opt/ext-toolchain and the sysroot is -moved to host/-buildroot-linux-gnu/sysroot/ directory. - -We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang -but it doesn't work since we already provide a sysroot [1]. - -Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. - -Since we want to be able to relocate the clang toolchain, -allow to use a relative path with GCC_INSTALL_PREFIX. - -Buildroot will provide such relative path by using: -HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` - -Doing so allow to use clang without providing additional search -paths with -B option on the clang's command line. - -[1] https://reviews.llvm.org/D49244 -[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html - -Signed-off-by: Romain Naour -Signed-off-by: Matthew Weber ---- -Pending, access to llvm mailing lists to submit it is pending. They -seem to be having issues with their listserv. ---- - lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index 2ad45097dc..90d6b5b748 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( - - Prefixes.push_back(std::string(GCCToolchainDir)); - } else { -+ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; -+ - // If we have a SysRoot, try that first. - if (!D.SysRoot.empty()) { - Prefixes.push_back(D.SysRoot); -@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( - // Then look for gcc installed alongside clang. - Prefixes.push_back(D.InstalledDir + "/.."); - -+ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. -+ if (!GccIinstallPrefix.empty()) -+ { -+ if (llvm::sys::path::is_relative(GccIinstallPrefix)) -+ { -+ // Use a relative path to gcc from clang install path. -+ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); -+ } -+ else -+ { -+ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. -+ Prefixes.push_back(GCC_INSTALL_PREFIX); -+ } -+ } -+ - // Next, look for prefix(es) that correspond to distribution-supplied gcc - // installations. - if (D.SysRoot.empty()) { --- -2.20.1 - diff --git a/package/llvm-project/clang/Config.in b/package/llvm-project/clang/Config.in index 2e23888720..4eda9391dd 100644 --- a/package/llvm-project/clang/Config.in +++ b/package/llvm-project/clang/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_CLANG depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring depends on BR2_HOST_GCC_AT_LEAST_7 + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 select BR2_PACKAGE_LLVM help Clang is a C/C++, Objective C/C++ and OpenCL C front-end diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash index 33b50af6bf..d44ea9a3b3 100644 --- a/package/llvm-project/clang/clang.hash +++ b/package/llvm-project/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 a6b673ef15377fb46062d164e8ddc4d05c348ff8968f015f7f4af03f51000067 clang-15.0.7.src.tar.xz +sha256 97025772b25c6694db049d3c4be5a72d926299aa1a9b861f490d66750e31c9dd clang-20.1.5.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 0bafd6461b..a5c8b990aa 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -14,9 +14,12 @@ CLANG_CPE_ID_VENDOR = llvm CLANG_SUPPORTS_IN_SOURCE_BUILD = NO CLANG_INSTALL_STAGING = YES -HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 +HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 host-python3 CLANG_DEPENDENCIES = llvm host-clang +# since we have LLVM_ENABLE_LIBXML2=OFF, set CLANG_ENABLE_LIBXML2=OFF +CLANG_CONF_OPTS += -DCLANG_ENABLE_LIBXML2=OFF + # This option is needed, otherwise multiple shared libs # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will # be generated. As a final shared lib containing all these components @@ -45,12 +48,14 @@ CLANG_CONF_OPTS += -DCLANG_BUILD_TOOLS=ON HOST_CLANG_CONF_OPTS += \ -DCLANG_BUILD_EXAMPLES=OFF \ -DCLANG_INCLUDE_DOCS=OFF \ - -DCLANG_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF CLANG_CONF_OPTS += \ -DCLANG_BUILD_EXAMPLES=OFF \ -DCLANG_INCLUDE_DOCS=OFF \ - -DCLANG_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_DEFAULT_LINKER=$(TARGET_LD) @@ -59,6 +64,12 @@ CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen +HOST_CLANG_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm +CLANG_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm + +HOST_CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION) +CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION) + # Clang can't be used as compiler on the target since there are no # development files (headers) and other build tools. So remove clang # binaries and some other unnecessary files from target. @@ -102,7 +113,15 @@ CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all # installation directory to the external toolchain installation directory in order to # not hardcode the toolchain absolute path. ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` +define HOST_CLANG_INSTALL_CONFIG_FILE + mkdir -p $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR) + touch $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg + echo "--gcc-install-dir=$(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/lib/gcc/$$(ls $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/lib/gcc/)/$$(ls $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/lib/gcc/$$(ls $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/lib/gcc/)/)" > $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg + echo "--target=$(GNU_TARGET_NAME)" >> $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg +endef + +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_INSTALL_CONFIG_FILE +HOST_CLANG_TOOLCHAIN_WRAPPER_ARGS += -DBR_CLANG_CONFIG_FILE="\"--config=$(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg\"" endif define HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in index 10f5d796b3..b665165516 100644 --- a/package/llvm-project/compiler-rt/Config.in +++ b/package/llvm-project/compiler-rt/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_COMPILER_RT depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang select BR2_PACKAGE_LIBXCRYPT + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help A collection of runtime libraries primarily used by clang and llvm to provide builtins, sanitizer runtimes, and profiling diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash index f84a8a33a7..5816e91702 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.hash +++ b/package/llvm-project/compiler-rt/compiler-rt.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 353832c66cce60931ea0413b3c071faad59eefa70d02c97daa8978b15e4b25b7 compiler-rt-15.0.7.src.tar.xz +sha256 bdcebca627f377ffcff5405cd5694efbddb14c89ad7d0ea481b1646a42bfeca3 compiler-rt-20.1.5.src.tar.xz sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index cbd2e6cb8b..ff3205f216 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -20,7 +20,8 @@ COMPILER_RT_CONF_OPTS = \ -DCOMPILER_RT_STANDALONE_BUILD=ON \ -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \ -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \ - -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \ + -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm # The installation of the target runtime libraries defaults to DESTDIR, however # host-clang resources directory needs a link so Clang can find the runtime @@ -29,9 +30,9 @@ COMPILER_RT_CONF_OPTS = \ # assumed, as compiler-rt is usually build at the same time as Clang and not # standalone. define COMPILER_RT_SETUP_RUNTIME_LIBS - mkdir -p $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib - ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/lib/linux $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib/linux - ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/share $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/share + mkdir -p $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/lib + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/lib/linux $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/lib/linux + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/share $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/share endef COMPILER_RT_POST_INSTALL_STAGING_HOOKS += COMPILER_RT_SETUP_RUNTIME_LIBS diff --git a/package/llvm-project/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch index de7207bedb..d2cde4de0a 100644 --- a/package/llvm-project/libclc/0001-support-out-of-tree-build.patch +++ b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch @@ -1,71 +1,32 @@ -From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Tue, 9 Mar 2021 15:55:17 -0600 +From a435f3c9318935ba29b04dabe7342cd6160711e0 Mon Sep 17 00:00:00 2001 +From: El Mehdi YOUNES +Date: Thu, 15 May 2025 10:02:12 +0200 Subject: [PATCH] support out of tree build -(1) The package has a prepare_builtins tool which is built +prepare_builtins tool is built but not placed in the path for later use in the build. This fix allows the later build steps to use the binary in-place. -(2) With cmake, find_file() when used for non-host builds is -limited by CMAKE_FIND_ROOT_PATH* scope. +Upstream: Not submitted -In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the -following target settings for CMAKE_FIND_ROOT_PATH* which -limit the scope. -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - -Signed-off-by: Matthew Weber +Signed-off-by: El Mehdi YOUNES --- - CMakeLists.txt | 2 +- - cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ - cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ - 3 files changed, 9 insertions(+), 1 deletion(-) + libclc/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9472f19..a784519 100644 +index d651a9bf506b..18bd7efe8217 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) - - # Add prepare target - add_custom_command( OUTPUT "${obj_suffix}" -- COMMAND prepare_builtins -o -+ COMMAND ./prepare_builtins -o - "${obj_suffix}" - "builtins.opt.${obj_suffix}" - DEPENDS "opt.${obj_suffix}" -diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake -index 94d85d9..5de6a48 100644 ---- a/cmake/CMakeDetermineCLCCompiler.cmake -+++ b/cmake/CMakeDetermineCLCCompiler.cmake -@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) - - set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") - set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") --find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) -+set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) - # configure all variables set in this file - configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) - mark_as_advanced(clc_comp_in) -diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake -index 1c424c7..dd3bfb6 100644 ---- a/cmake/CMakeDetermineLLAsmCompiler.cmake -+++ b/cmake/CMakeDetermineLLAsmCompiler.cmake -@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) - set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") - set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") - set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") --find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) -+set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) - # configure all variables set in this file - configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) - mark_as_advanced(ll_comp_in) +@@ -180,7 +180,7 @@ set(LLVM_LINK_COMPONENTS + ) + if( LIBCLC_STANDALONE_BUILD ) + add_llvm_executable( prepare_builtins utils/prepare-builtins.cpp ) +- set( prepare_builtins_exe prepare_builtins ) ++ set( prepare_builtins_exe ./prepare_builtins ) + set( prepare_builtins_target prepare_builtins ) + else() + add_llvm_utility( prepare_builtins utils/prepare-builtins.cpp ) -- -2.17.1 +2.43.0 diff --git a/package/llvm-project/libclc/Config.in b/package/llvm-project/libclc/Config.in index 85eb888578..6b92357e0f 100644 --- a/package/llvm-project/libclc/Config.in +++ b/package/llvm-project/libclc/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBCLC bool "libclc" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help libclc is an open source, BSD licensed implementation of the library requirements of the OpenCL C programming language, diff --git a/package/llvm-project/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash index 5ee088a379..cfce638f6e 100644 --- a/package/llvm-project/libclc/libclc.hash +++ b/package/llvm-project/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 35731fea7be224f21acf5bf3cd9f0ed058bf4ada5eceaf7f10ee96e139bd3389 libclc-15.0.7.src.tar.xz +sha256 7aabcc31eff12bc54778c38752192939df8d983002c961cb1ac97f57e50ccff1 libclc-20.1.5.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk index cfa978a8ac..399878bf0b 100644 --- a/package/llvm-project/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -27,8 +27,6 @@ LIBCLC_CONF_OPTS = \ -DCMAKE_SYSROOT="" \ -DCMAKE_C_COMPILER_FORCED=ON \ -DCMAKE_CXX_COMPILER_FORCED=ON \ - -DCMAKE_CLC_COMPILER_FORCED=ON \ - -DCMAKE_LLAsm_COMPILER_FORCED=ON \ -DCMAKE_INSTALL_DATADIR="share" \ -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ @@ -38,7 +36,8 @@ LIBCLC_CONF_OPTS = \ -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ - -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" + -DLLVM_CMAKE_DIR="$(HOST_DIR)/lib/cmake/llvm" \ + -DLIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR="$(HOST_DIR)/bin" HOST_LIBCLC_CONF_OPTS = \ -DLIBCLC_TARGETS_TO_BUILD=spirv64-mesa3d- diff --git a/package/llvm-project/lld/Config.in.host b/package/llvm-project/lld/Config.in.host index 3bed364a79..63f9f68558 100644 --- a/package/llvm-project/lld/Config.in.host +++ b/package/llvm-project/lld/Config.in.host @@ -2,6 +2,7 @@ config BR2_PACKAGE_HOST_LLD bool "host lld" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help LLD is a linker from the LLVM project that is a drop-in replacement for system linkers, and runs much faster than diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash index b30e38f02b..971eec6372 100644 --- a/package/llvm-project/lld/lld.hash +++ b/package/llvm-project/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 dba5c70c3fe88b3a38b9180df82fbc9d1dfd55d68f41fddd6a90f9e17f8e5df9 lld-15.0.7.src.tar.xz +sha256 4e084130cc51a8b900737cec40578eab867f7e8017121409940d96550784ff12 lld-20.1.5.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/llvm-project/lld/lld.mk b/package/llvm-project/lld/lld.mk index 539dd0bd71..c9a2d3796b 100644 --- a/package/llvm-project/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -15,6 +15,8 @@ HOST_LLD_DEPENDENCIES = host-llvm host-llvm-libunwind # build as static libs as is done in llvm & clang HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF +HOST_LLD_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm + # GCC looks for tools in a different path from LLD's default installation path define HOST_LLD_CREATE_SYMLINKS mkdir -p $(HOST_DIR)/$(GNU_TARGET_NAME)/bin diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash index 756404cdd9..962633f665 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 8986f29b634fdaa9862eedda78513969fe9788301c9f2d938f4c10a3e7a3e7ea cmake-15.0.7.src.tar.xz +sha256 1b5abaa2686c6c0e1f394113d0b2e026ff3cb9e11b6a2294c4f3883f1b02c89c cmake-20.1.5.src.tar.xz diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk index 33b6ba8339..26dc04dcd7 100644 --- a/package/llvm-project/llvm-cmake/llvm-cmake.mk +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk @@ -10,8 +10,9 @@ LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz LLVM_CMAKE_LICENSE = Apache-2.0 with exceptions define HOST_LLVM_CMAKE_INSTALL_CMDS - mkdir -p $(HOST_DIR)/lib/cmake/llvm - cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm + mkdir -p $(HOST_DIR)/lib/cmake/llvm/Modules + cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm/Modules + ln -sf $(HOST_DIR)/lib/cmake/llvm/Modules/* $(HOST_DIR)/lib/cmake/llvm/ endef $(eval $(host-generic-package)) diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash index 58a3230301..d95fa17622 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 406d199ae3a16add84017f40458a5e7c31f9412937fcb518715af0a0eeafbc0c libunwind-15.0.7.src.tar.xz +sha256 f0555603222189d8d2ff2d02747c63a3bbeb291fa72ce042c1a6d26399150baf libunwind-20.1.5.src.tar.xz sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk index b293c7ccc2..e7b59a9dcf 100644 --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk @@ -11,9 +11,8 @@ LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions LLVM_LIBUNWIND_LICENSE_FILES = LICENSE.TXT LLVM_LIBUNWIND_SUPPORTS_IN_SOURCE_BUILD = NO -HOST_LLVM_LIBUNWIND_DEPENDENCIES = host-llvm-cmake +HOST_LLVM_LIBUNWIND_DEPENDENCIES = host-llvm-cmake host-llvm-runtimes HOST_LLVM_LIBUNWIND_CONF_OPTS += \ - -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" \ - -DLIBUNWIND_INSTALL_HEADERS=ON + -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" $(eval $(host-cmake-package)) diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk index 6f075793a5..fdbfcbadc9 100644 --- a/package/llvm-project/llvm-project.mk +++ b/package/llvm-project/llvm-project.mk @@ -4,8 +4,8 @@ # ################################################################################ -LLVM_PROJECT_VERSION_MAJOR = 15 -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).0.7 +LLVM_PROJECT_VERSION_MAJOR = 20 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.5 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 new file mode 100644 index 0000000000..93077efaba --- /dev/null +++ b/package/llvm-project/llvm-runtimes/llvm-runtimes.hash @@ -0,0 +1,2 @@ +# locally calculated +sha256 8b3255668594ca3450ac5c041ac52c3c33300873d033cda49529e7fe1d4257e6 runtimes-20.1.5.src.tar.xz diff --git a/package/llvm-project/llvm-runtimes/llvm-runtimes.mk b/package/llvm-project/llvm-runtimes/llvm-runtimes.mk new file mode 100644 index 0000000000..1886ff3a14 --- /dev/null +++ b/package/llvm-project/llvm-runtimes/llvm-runtimes.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# llvm-runtimes +# +################################################################################ + +LLVM_RUNTIMES_VERSION = $(LLVM_PROJECT_VERSION) +LLVM_RUNTIMES_SITE = $(LLVM_PROJECT_SITE) +LLVM_RUNTIMES_SOURCE = runtimes-$(LLVM_RUNTIMES_VERSION).src.tar.xz +LLVM_RUNTIMES_LICENSE = Apache-2.0 with exceptions + +define HOST_LLVM_RUNTIMES_INSTALL_CMDS + mkdir -p $(HOST_DIR)/lib/cmake/llvm/Modules + cp -Rv $(@D)/cmake/Modules/* $(HOST_DIR)/lib/cmake/llvm +endef + +$(eval $(host-generic-package)) diff --git a/package/llvm-project/llvm/0001-ADT-Add-cstdint-to-SmallVector-101761.patch b/package/llvm-project/llvm/0001-ADT-Add-cstdint-to-SmallVector-101761.patch deleted file mode 100644 index eea83c27a8..0000000000 --- a/package/llvm-project/llvm/0001-ADT-Add-cstdint-to-SmallVector-101761.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 51d88407c1ae86c3b3c7b497d049f8980f2a3510 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 2 Aug 2024 23:07:21 +0100 -Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -SmallVector uses `uint32_t`, `uint64_t` without including `` -which fails to build w/ GCC 15 after a change in libstdc++ [0] - -[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2 - -Gentoo-Component: llvm -Signed-off-by: Michał Górny -Signed-off-by: James Hilliard -Upstream: https://bugs.gentoo.org/939498 ---- - include/llvm/ADT/SmallVector.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h -index e34702bdbb3c..1c0f3465b2a9 100644 ---- a/include/llvm/ADT/SmallVector.h -+++ b/include/llvm/ADT/SmallVector.h -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.46.0 diff --git a/package/llvm-project/llvm/0001-Fix-standalone-build-for-llvm.patch b/package/llvm-project/llvm/0001-Fix-standalone-build-for-llvm.patch new file mode 100644 index 0000000000..cbb15599cb --- /dev/null +++ b/package/llvm-project/llvm/0001-Fix-standalone-build-for-llvm.patch @@ -0,0 +1,49 @@ +From 255068deb7f3d18837ed30e739aa92c111ab450a Mon Sep 17 00:00:00 2001 +From: El Mehdi YOUNES +Date: Sat, 10 May 2025 12:55:07 +0200 +Subject: [PATCH] Fix standalone build for llvm + +Upstream commit 9dd01a5241dc ("Harmonize cmake_policy() across standalone builds of all projects") +moved the `cmake_policy()` settings from `llvm/CMakeLists.txt` into a shared +`cmake/modules/CMakePolicy.cmake`, and included it from all relevant projects +(Clang, LLD, LLDB, etc.) to harmonize standalone builds. + +However, in `llvm/CMakeLists.txt`, unlike other components, the line: + set(LLVM_COMMON_CMAKE_UTILS ...) +was left **without** the usual: + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + +This prevents external build systems (e.g., when using separate source archives) +from overriding the `LLVM_COMMON_CMAKE_UTILS` variable, since the value is +always reset unconditionally. + +This patch adds the missing `if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)` guard, +in the same way as it is already done in Clang, LLD, etc., to make +`LLVM_COMMON_CMAKE_UTILS` properly overridable. + +Upstream: Not submitted + +Signed-off-by: El Mehdi YOUNES +--- + llvm/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5293e866324..d861233f299f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,10 @@ cmake_minimum_required(VERSION 3.20.0) + + include(CMakeDependentOption) + +-set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) ++if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) ++ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) ++endif() ++ + include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake + NO_POLICY_SCOPE) + +-- +2.49.0 + diff --git a/package/llvm-project/llvm/0002-AMDGPU-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch b/package/llvm-project/llvm/0002-AMDGPU-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch deleted file mode 100644 index 73beab6c23..0000000000 --- a/package/llvm-project/llvm/0002-AMDGPU-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 000f92beb459096534a7bfaa8c5e99d77b7594c1 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 3 Aug 2024 06:36:43 +0100 -Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc - (#101766) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Gentoo-Component: llvm -Signed-off-by: Michał Górny -Signed-off-by: James Hilliard -Upstream: https://bugs.gentoo.org/939498 ---- - lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h -index c2e2563c3989..53aac8934100 100644 ---- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h -+++ b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h -@@ -15,6 +15,7 @@ - #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H - #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H - -+#include - #include - - namespace llvm { --- -2.46.0 diff --git a/package/llvm-project/llvm/0003-Another-gcc-15-fix-from-Sam-James.patch b/package/llvm-project/llvm/0003-Another-gcc-15-fix-from-Sam-James.patch deleted file mode 100644 index bc958bb056..0000000000 --- a/package/llvm-project/llvm/0003-Another-gcc-15-fix-from-Sam-James.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 67fc0069c285b37f09d408aae43c37b8afdf11f7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sat, 3 Aug 2024 12:01:20 +0200 -Subject: [PATCH] Another gcc-15 fix from Sam James -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: https://bugs.gentoo.org/937164 -Gentoo-Component: llvm -Signed-off-by: Michał Górny -Signed-off-by: James Hilliard -Upstream: https://bugs.gentoo.org/939498 ---- - lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h -index d0530bd4d650..10b59462aebe 100644 ---- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h -+++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h -@@ -13,6 +13,7 @@ - #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H - #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H - -+#include - #include - #include - --- -2.46.0 diff --git a/package/llvm-project/llvm/Config.in b/package/llvm-project/llvm/Config.in index 4ee84b3bcc..fcf6417a33 100644 --- a/package/llvm-project/llvm/Config.in +++ b/package/llvm-project/llvm/Config.in @@ -24,6 +24,7 @@ config BR2_PACKAGE_LLVM depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash index 4325da6f6b..bc46117ec6 100644 --- a/package/llvm-project/llvm/llvm.hash +++ b/package/llvm-project/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 4ad8b2cc8003c86d0078d15d987d84e3a739f24aae9033865c027abae93ee7a4 llvm-15.0.7.src.tar.xz +sha256 9a9a80ca4c0d902531f2b43e9e4d6c36b57cdd5702430e0b54567bf273bd32c1 llvm-20.1.5.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk index b0515474d8..7552e3590c 100644 --- a/package/llvm-project/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -20,11 +20,19 @@ LLVM_DEPENDENCIES = host-llvm HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm +HOST_LLVM_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm +LLVM_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm + # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects # This flag assumes that projects are checked out side-by-side and not nested HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" +# LLVM_ENABLE_RUNTIMES for runtime components libcxx etc + +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RUNTIMES="" +LLVM_CONF_OPTS += -DLLVM_ENABLE_RUNTIMES="" + HOST_LLVM_CONF_OPTS += -DLLVM_CCACHE_BUILD=$(if $(BR2_CCACHE),ON,OFF) LLVM_CONF_OPTS += -DLLVM_CCACHE_BUILD=$(if $(BR2_CCACHE),ON,OFF) @@ -151,6 +159,10 @@ LLVM_CONF_OPTS += -DLLVM_ENABLE_Z3_SOLVER=OFF HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON +# Disable TFTLite integration +HOST_LLVM_CONF_OPTS += -DLLVM_HAVE_TFLITE="" +LLVM_CONF_OPTS += -DLLVM_HAVE_TFLITE="" + # Default is Debug build, which requires considerably more disk space and # build time. Release build is selected for host and target because the linker # can run out of memory in Debug mode. @@ -261,7 +273,6 @@ HOST_LLVM_CONF_OPTS += \ -DLLVM_ENABLE_SPHINX=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF LLVM_CONF_OPTS += \ @@ -273,7 +284,6 @@ LLVM_CONF_OPTS += \ -DLLVM_ENABLE_SPHINX=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF diff --git a/package/lshw/lshw.hash b/package/lshw/lshw.hash index 5626d7131e..40f150778c 100644 --- a/package/lshw/lshw.hash +++ b/package/lshw/lshw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c62c89d4b3305d897bd644524bbc816c1793c41c9fea10381b75f9d5b074e056 lshw-d76afbaaf40e953243da921844cddff8185324f3.tar.gz +sha256 6b8346a89fb0f0f1798e66f6a707a881d38b9b3a67256b30fc4628dac09f291a lshw-02.20.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 86c8f356cc..70fa2aef27 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -4,8 +4,8 @@ # ################################################################################ -LSHW_VERSION = d76afbaaf40e953243da921844cddff8185324f3 -LSHW_SITE = $(call github,lyonel,lshw,$(LSHW_VERSION)) +LSHW_VERSION = 02.20 +LSHW_SITE = $(call github,lyonel,lshw,B.$(LSHW_VERSION)) LSHW_LICENSE = GPL-2.0 LSHW_LICENSE_FILES = COPYING diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index d54395c29b..fbcc0dd6fa 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 44e5087cd3c47058f9934b90c0017e4cf870b71619f99707dd433074622debb1 luaposix-36.2.1.tar.gz -sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE +sha256 82cd9a96c41a4a3205c050206f0564ff4456f773a8f9ffc9235ff8f1907ca5e6 luaposix-36.3.tar.gz +sha256 0aaf3d6797693f3ea0ef4df2cb4d43627b00eb08213ead4fb037a8c4a04f8631 LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index c5d98fbbd4..46be3b42a5 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.2.1 +LUAPOSIX_VERSION = 36.3 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 1abaeb0497..8492c150cd 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,6 @@ # From https://sourceware.org/ftp/lvm2/sha512.sum -sha512 02607797f067b2b26d615b9a182ad70017e61d436e3866acf820a04154e503fb59114e9a4540a273d9f570d0337332ca995fb3be83c11eadaca53c1b826eb810 LVM2.2.03.27.tgz +sha512 254131e28b22d55531d211886afbfdc219e77a4df802e3ec9b66d889ff22bf6d0a6c2df9c5ff017592d92e1dce0f658a6628fb321c1e90152ff7257492218242 LVM2.2.03.31.tgz + # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 2fc24be60e..3a1dded55f 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.27 +LVM2_VERSION = 2.03.31 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index cc0121f6d6..fd4805a728 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -11,7 +11,8 @@ MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - -Dgles1=disabled + -Dgles1=disabled \ + -Dosmesa=disabled # BR2_PACKAGE_MESA3D_OSMESA_GALLIUM removed in mesa 25.1 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext @@ -52,14 +53,6 @@ endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += -Dwith-glut=$(STAGING_DIR)/usr -# osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled -else -MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled -endif -else -MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_LIBDECOR)$(BR2_PACKAGE_WAYLAND),yy) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index cabdbe6595..45b7e9084a 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.0.6 +MESA3D_HEADERS_VERSION = 25.1.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-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch deleted file mode 100644 index ff362551ea..0000000000 --- a/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 17 Apr 2019 23:07:42 +0200 -Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Based on the patch for autotools provided by Valentin Korenblit. - -Signed-off-by: Romain Naour -Signed-off-by: Bernd Kuhls -[rebased for 20.2.0, 20.3.0 & 25.0.0] ---- - src/gallium/frontends/clover/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build -index 62ac5f5278d..ecdeb39669c 100644 ---- a/src/gallium/frontends/clover/meson.build -+++ b/src/gallium/frontends/clover/meson.build -@@ -10,7 +10,7 @@ - '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', - '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', - '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', -- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')), -+ '-DLIBCLC_INCLUDEDIR="/usr/share"', - '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) - ] - clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux] --- -2.20.1 - diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch similarity index 93% rename from package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch rename to package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index 3b9bca0693..04b33a7856 100644 --- a/package/mesa3d/0002-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,19 +10,19 @@ 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] +[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0, 24.3.0 & 25.1.0] Signed-off-by: Peter Seiderer [fix syntax error after previous rebases] --- - meson_options.txt | 7 +++++++ + meson.options | 7 +++++++ src/gallium/drivers/vc4/meson.build | 4 ++-- src/gallium/drivers/vc4/vc4_tiling.h | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) -diff --git a/meson_options.txt b/meson_options.txt +diff --git a/meson.options b/meson.options index 8e0bf2a..1cf0e07 100644 ---- a/meson_options.txt -+++ b/meson_options.txt +--- a/meson.options ++++ b/meson.options @@ -117,6 +117,13 @@ option( description : 'enable gallium va frontend.', ) diff --git a/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/package/mesa3d/0002-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch similarity index 100% rename from package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch rename to package/mesa3d/0002-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch diff --git a/package/mesa3d/0004-Fix-uClibc-build.patch b/package/mesa3d/0003-Fix-uClibc-build.patch similarity index 100% rename from package/mesa3d/0004-Fix-uClibc-build.patch rename to package/mesa3d/0003-Fix-uClibc-build.patch diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 98c77125e1..fd9beb4704 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -21,6 +21,12 @@ if BR2_PACKAGE_MESA3D config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS bool +config BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + bool + select BR2_PACKAGE_MESA3D_OPENCL + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + select BR2_PACKAGE_SPIRV_TOOLS + config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS @@ -44,19 +50,44 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 -# clang and libclc dependencies are satisfied by -# BR2_PACKAGE_MESA3D_LLVM -config BR2_PACKAGE_MESA3D_OPENCL +menuconfig BR2_PACKAGE_MESA3D_OPENCL bool "OpenCL support" depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST || \ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS || \ - BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL + BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL || \ + BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL +if BR2_PACKAGE_MESA3D_OPENCL +# libclc dependency is satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_RUSTICL + bool "RustiCL" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_LLVM_DUMP + select BR2_PACKAGE_SPIRV_TOOLS + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + select BR2_PACKAGE_OPENCL_ICD_LOADER + help + RustiCL is an OpenCL implementation written in Rust. + By default, devices are disabled in RustiCL. If you want + to enable a device, you need to set the environment variable + RUSTICL_ENABLE to the driver you are using. + + https://docs.mesa3d.org/envvars.html#envvar-RUSTICL_ENABLE + +endif # BR2_PACKAGE_MESA3D_OPENCL + +config BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + bool # inform the .mk file of gallium or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER @@ -132,9 +163,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS bool "Gallium iris driver" depends on BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_OPENCL - select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR - select BR2_PACKAGE_SPIRV_TOOLS + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Mesa driver for iris-based Intel GPUs. @@ -152,6 +182,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE bool "Gallium llvmpipe driver" depends on BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help This is a llvm opengl implementation using the Gallium3D infrastructure. @@ -165,16 +196,23 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU select BR2_PACKAGE_LIBDRM_NOUVEAU select BR2_PACKAGE_MESA3D_NEEDS_XA select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Supports all Nvidia GPUs. config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. +comment "panfrost driver needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 bool "Gallium Radeon R300 driver" depends on BR2_i386 || BR2_x86_64 @@ -219,6 +257,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI select BR2_PACKAGE_LLVM_AMDGPU select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs. @@ -326,10 +365,8 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert depends on BR2_PACKAGE_MESA3D_LLVM - select BR2_PACKAGE_MESA3D_OPENCL + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER select BR2_PACKAGE_MESA3D_VULKAN_DRIVER - select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR - select BR2_PACKAGE_SPIRV_TOOLS help Vulkan driver for Intel hardware from Ivy Bridge onward. @@ -355,14 +392,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO help Vulkan VirtIO (venus) driver. -comment "Off-screen Rendering" - -config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM - bool "OSMesa (Gallium) library" - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE - help - The OSMesa API provides functions for off-screen rendering. - if BR2_PACKAGE_MESA3D_DRIVER comment "OpenGL API Support" diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index c94611ff05..ee99e8b635 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2025-May/000803.html -sha256 0d179e019e3441f5d957330d7abb3b0ef38e6782cc85a382608cd1a4a77fa2e1 mesa-25.0.6.tar.xz -sha512 6a0abc8a5bbbb8ffdad7286fc5642f643b1f4183794425ba689c2c9f5c73a4131c8685074241deb1022631b4c1f1c505dbd848190ec60d5d6931e90dd9316e05 mesa-25.0.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2025-May/000804.html +sha256 cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce mesa-25.1.1.tar.xz +sha512 8000fec61da3b7c0355b74458c52f8faeb562398a1882d68cd31a253848edd3333072521ec52f8c5c1a62d909afd6667803d43cb54027d0af3d944f1add27aae mesa-25.1.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 bc456a43a3..000b9150f1 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.0.6 +MESA3D_VERSION = 25.1.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -30,10 +30,7 @@ MESA3D_DEPENDENCIES = \ zlib MESA3D_CONF_OPTS = \ - -Dgallium-opencl=disabled \ - -Dgallium-rusticl=false \ - -Dmicrosoft-clc=disabled \ - -Dpower8=disabled + -Dmicrosoft-clc=disabled ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) MESA3D_DEPENDENCIES += xlib_libxshmfence @@ -58,6 +55,30 @@ MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc endif +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) +MESA3D_DEPENDENCIES += \ + host-rustc \ + host-rust-bindgen \ + spirv-tools \ + spirv-llvm-translator \ + opencl-icd-loader + +# rust_std is defined here to workaround a known meson bug. See: +# https://docs.mesa3d.org/rusticl.html#known-issues +# https://github.com/mesonbuild/meson/issues/10664 +MESA3D_CONF_OPTS += \ + -Dgallium-rusticl=true \ + -Drust_std=2021 \ + -Dmesa-clc-bundle-headers=enabled + +MESA3D_MESON_EXTRA_BINARIES += \ + rust=['$(HOST_DIR)/bin/rustc','--target=$(RUSTC_TARGET_NAME)'] \ + rust_ld='$(TARGET_CROSS)gcc' + +else +MESA3D_CONF_OPTS += -Dgallium-rusticl=false +endif + ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) MESA3D_DEPENDENCIES += elfutils endif @@ -65,7 +86,7 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # Disable-mangling not yet supported by meson build system. # glx: -# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# dri : dri based GLX requires at least one DRI driver # xlib : xlib conflicts with any dri driver # Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ @@ -96,10 +117,12 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris +HOST_MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE) += llvmpipe MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost +HOST_MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi @@ -122,7 +145,6 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - -Dshared-glapi=enabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ -Dgallium-extra-hud=true endif @@ -133,11 +155,9 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y) MESA3D_DEPENDENCIES += host-python-ply -MESA3D_CONF_OPTS += -Dmesa-clc=system -Dprecomp-compiler=system -MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools endif -ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER),y) MESA3D_CONF_OPTS += -Dmesa-clc=system -Dprecomp-compiler=system MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools endif @@ -153,12 +173,6 @@ endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_CONF_OPTS += -Dosmesa=true -else -MESA3D_CONF_OPTS += -Dosmesa=false -endif - # Always enable OpenGL: # - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. MESA3D_CONF_OPTS += -Dopengl=true @@ -275,11 +289,9 @@ else MESA3D_CONF_OPTS += -Dglvnd=disabled endif -# host-mesa3d is needed by mesa3d only when the Iris Gallium driver is -# enabled HOST_MESA3D_CONF_OPTS = \ -Dglvnd=disabled \ - -Dgallium-drivers=iris \ + -Dgallium-drivers=$(subst $(space),$(comma),$(HOST_MESA3D_GALLIUM_DRIVERS-y)) \ -Dgallium-vdpau=disabled \ -Dinstall-mesa-clc=true \ -Dmesa-clc=enabled \ @@ -288,6 +300,10 @@ HOST_MESA3D_CONF_OPTS = \ -Dglx=disabled \ -Dvulkan-drivers="" +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +HOST_MESA3D_CONF_OPTS += -Dtools=panfrost +endif + HOST_MESA3D_DEPENDENCIES = \ host-libclc \ host-libdrm \ @@ -295,9 +311,15 @@ HOST_MESA3D_DEPENDENCIES = \ host-python-pyyaml \ host-spirv-tools +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +HOST_MESA3D_INSTALL_PANFROST_COMPILE = \ + $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/panfrost/clc/panfrost_compile $(HOST_DIR)/bin/panfrost_compile +endif + define HOST_MESA3D_INSTALL_CMDS $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/compiler/clc/mesa_clc $(HOST_DIR)/bin/mesa_clc - $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/compiler/spirv/vtn_bindgen $(HOST_DIR)/bin/vtn_bindgen + $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/compiler/spirv/vtn_bindgen2 $(HOST_DIR)/bin/vtn_bindgen2 + $(HOST_MESA3D_INSTALL_PANFROST_COMPILE) endef $(eval $(meson-package)) diff --git a/package/mjpegtools/0001-gcc15.patch b/package/mjpegtools/0001-gcc15.patch new file mode 100644 index 0000000000..019317c7fd --- /dev/null +++ b/package/mjpegtools/0001-gcc15.patch @@ -0,0 +1,354 @@ +Fix build with gcc-15.x + +Upstream: https://sourceforge.net/p/mjpeg/Code/3513/ + +Signed-off-by: Bernd Kuhls + +Index: trunk/mjpeg_play/y4mdenoise/Region2D.hh +=================================================================== +--- mjpeg_play/y4mdenoise/Region2D.hh (Revision 3512) ++++ mjpeg_play/y4mdenoise/Region2D.hh (Revision 3513) +@@ -97,35 +97,11 @@ + // Add the given horizontal extent to the region. Note that + // a_tnXEnd is technically one past the end of the extent. + +- template +- void UnionDebug (Status_t &a_reStatus, INDEX a_tnY, +- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp); +- // Add the given horizontal extent to the region. Note that +- // a_tnXEnd is technically one past the end of the extent. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) +- + template + void Union (Status_t &a_reStatus, const REGION &a_rOther); + // Make the current region represent the union between itself + // and the other given region. + +- template +- void UnionDebug (Status_t &a_reStatus, +- REGION_O &a_rOther, REGION_TEMP &a_rTemp); +- // Make the current region represent the union between itself +- // and the other given region. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) +- + //void Merge (Status_t &a_reStatus, INDEX a_tnY, INDEX a_tnXStart, + // INDEX a_tnXEnd); + // Merge this extent into the current region. +@@ -166,36 +142,11 @@ + // Subtract the given horizontal extent from the region. Note + // that a_tnXEnd is technically one past the end of the extent. + +- template +- void SubtractDebug (Status_t &a_reStatus, INDEX a_tnY, +- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp); +- // Subtract the given horizontal extent from the region. Note +- // that a_tnXEnd is technically one past the end of the extent. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) +- + template + void Subtract (Status_t &a_reStatus, const REGION &a_rOther); + // Subtract the other region from the current region, i.e. + // remove from the current region any extents that exist in the + // other region. +- +- template +- void SubtractDebug (Status_t &a_reStatus, REGION_O &a_rOther, +- REGION_TEMP &a_rTemp); +- // Subtract the other region from the current region, i.e. +- // remove from the current region any extents that exist in the +- // other region. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) + + //typedef ... ConstIterator; + //ConstIterator Begin (void) const { return m_setExtents.Begin(); } +@@ -404,85 +355,6 @@ + + + +-// Add the given horizontal extent to the region. +-template +-template +-void +-Region2D::UnionDebug (Status_t &a_reStatus, INDEX a_tnY, +- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp) +-{ +- typename REGION::ConstIterator itHere; +- typename REGION_TEMP::ConstIterator itHereO; +- INDEX tnX; +- // Used to loop through points. +- +- // Make sure they didn't start us off with an error. +- assert (a_reStatus == g_kNoError); +- +- // Calculate the union. +- a_rTemp.Assign (a_reStatus, *this); +- if (a_reStatus != g_kNoError) +- return; +- a_rTemp.Union (a_reStatus, a_tnY, a_tnXStart, a_tnXEnd); +- if (a_reStatus != g_kNoError) +- return; +- +- // Loop through every point in the result, make sure it's in +- // one of the two input regions. +- for (itHereO = a_rTemp.Begin(); itHereO != a_rTemp.End(); ++itHereO) +- { +- const Extent &rHere = *itHereO; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!((rHere.m_tnY == a_tnY +- && (tnX >= a_tnXStart && tnX < a_tnXEnd)) +- || this->DoesContainPoint (rHere.m_tnY, tnX))) +- goto error; +- } +- } +- +- // Loop through every point in the original region, make sure +- // it's in the result. +- for (itHere = this->Begin(); itHere != this->End(); ++itHere) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // Loop through every point in the added extent, make sure it's in +- // the result. +- for (tnX = a_tnXStart; tnX < a_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (a_tnY, tnX)) +- goto error; +- } +- +- // The operation succeeded. Commit it. +- Assign (a_reStatus, a_rTemp); +- if (a_reStatus != g_kNoError) +- return; +- +- // All done. +- return; +- +-error: +- // Handle deviations. +- fprintf (stderr, "Region2D::Union() failed\n"); +- fprintf (stderr, "Input region:\n"); +- PrintRegion (*this); +- fprintf (stderr, "Input extent: [%d,%d-%d]\n", +- int (a_tnY), int (a_tnXStart), int (a_tnXEnd)); +- fprintf (stderr, "Result:\n"); +- PrintRegion (a_rTemp); +- assert (false); +-} +- +- +- + // Make the current region represent the union between itself + // and the other given region. + template +@@ -511,184 +383,6 @@ + } + } + +- +- +-// Make the current region represent the union between itself +-// and the other given region. +-template +-template +-void +-Region2D::UnionDebug (Status_t &a_reStatus, +- REGION_O &a_rOther, REGION_TEMP &a_rTemp) +-{ +- typename REGION::ConstIterator itHere; +- typename REGION_O::ConstIterator itHereO; +- typename REGION_TEMP::ConstIterator itHereT; +- INDEX tnX; +- // Used to loop through points. +- +- // Make sure they didn't start us off with an error. +- assert (a_reStatus == g_kNoError); +- +- // Calculate the union. +- a_rTemp.Assign (a_reStatus, *this); +- if (a_reStatus != g_kNoError) +- return; +- a_rTemp.Union (a_reStatus, a_rOther); +- if (a_reStatus != g_kNoError) +- return; +- +- // Loop through every point in the result, make sure it's in +- // one of the two input regions. +- for (itHereT = a_rTemp.Begin(); itHereT != a_rTemp.End(); ++itHereT) +- { +- const Extent &rHere = *itHereT; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rOther.DoesContainPoint (rHere.m_tnY, tnX) +- && !this->DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // Loop through every point in the first input region, make sure +- // it's in the result. +- for (itHere = this->Begin(); itHere != this->End(); ++itHere) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // Loop through every point in the second input region, make sure +- // it's in the result. +- for (itHereO = a_rOther.Begin(); +- itHereO != a_rOther.End(); +- ++itHereO) +- { +- const Extent &rHere = *itHereO; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // The operation succeeded. Commit it. +- Assign (a_reStatus, a_rTemp); +- if (a_reStatus != g_kNoError) +- return; +- +- // All done. +- return; +- +-error: +- // Handle deviations. +- fprintf (stderr, "Region2D::Union() failed\n"); +- fprintf (stderr, "First input region:\n"); +- PrintRegion (*this); +- fprintf (stderr, "Second input region:\n"); +- PrintRegion (a_rOther); +- fprintf (stderr, "Result:\n"); +- PrintRegion (a_rTemp); +- assert (false); +-} +- +- +- +-// Subtract the other region from the current region, i.e. +-// remove from the current region any areas that exist in the +-// other region. +-template +-template +-void +-Region2D::SubtractDebug (Status_t &a_reStatus, +- REGION_O &a_rOther, REGION_TEMP &a_rTemp) +-{ +- typename REGION::ConstIterator itHere; +- typename REGION_O::ConstIterator itHereO; +- typename REGION_TEMP::ConstIterator itHereT; +- INDEX tnX; +- // Used to loop through points. +- +- // Make sure they didn't start us off with an error. +- assert (a_reStatus == g_kNoError); +- +- // Calculate the difference. +- a_rTemp.Assign (a_reStatus, *this); +- if (a_reStatus != g_kNoError) +- return; +- a_rTemp.Subtract (a_reStatus, a_rOther); +- if (a_reStatus != g_kNoError) +- return; +- +- // Loop through every point in the result, make sure it's in +- // the first input region but not the second. +- for (itHereT = a_rTemp.Begin(); itHereT != a_rTemp.End(); ++itHereT) +- { +- const Extent &rHere = *itHereT; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!(this->DoesContainPoint (rHere.m_tnY, tnX) +- && !a_rOther.DoesContainPoint (rHere.m_tnY, tnX))) +- goto error; +- } +- } +- +- // Loop through every point in the first input region, and if it's +- // not in the second input region, make sure it's in the result. +- for (itHere = this->Begin(); itHere != this->End(); ++itHere) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rOther.DoesContainPoint (rHere.m_tnY, tnX)) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- } +- +- // Loop through every point in the second input region, make sure +- // it's not in the result. +- for (itHereO = a_rOther.Begin(); +- itHereO != a_rOther.End(); +- ++itHereO) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // The operation succeeded. Commit it. +- Assign (a_reStatus, a_rTemp); +- if (a_reStatus != g_kNoError) +- return; +- +- // All done. +- return; +- +-error: +- // Handle deviations. +- fprintf (stderr, "Region2D::Subtract() failed\n"); +- fprintf (stderr, "First input region:\n"); +- PrintRegion (*this); +- fprintf (stderr, "Second input region:\n"); +- PrintRegion (a_rOther); +- fprintf (stderr, "Result:\n"); +- PrintRegion (a_rTemp); +- assert (false); +-} +- +- +- + // Flood-fill the current region. + template + template diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 18b5e222ac..1a8774b056 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b6a6f69912c2cd0c67f85633c6b578d4dcdf385c3628acdcd21de28787c676e5 mongoose-7.17.tar.gz +sha256 8b661e8aceb00528fc21993afe218b1da0f0154575a61b63ce0791ad8b66b112 mongoose-7.18.tar.gz sha256 9abc2509d90c01ff2a0c91abf73582cdbcf1d2dbcc0b7973097eced43cf4cdd4 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8316a8d59a..c74330e5fd 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.17 +MONGOOSE_VERSION = 7.18 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE diff --git a/package/mrouted/0001-gcc15.patch b/package/mrouted/0001-gcc15.patch new file mode 100644 index 0000000000..781f83f5c7 --- /dev/null +++ b/package/mrouted/0001-gcc15.patch @@ -0,0 +1,33 @@ +From cdb388c8dc6e661d2a23f1e9b79102bc68e89af5 Mon Sep 17 00:00:00 2001 +From: Philippe Troin +Date: Wed, 23 Apr 2025 16:04:20 -0700 +Subject: [PATCH] C23 compatibility. + +bool is a keyword in C23. + +Upstream: https://github.com/troglobit/mrouted/pull/65 + +Signed-off-by: Bernd Kuhls +--- + src/kern.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/kern.c b/src/kern.c +index 27f8dd4..04f1c36 100644 +--- a/src/kern.c ++++ b/src/kern.c +@@ -104,11 +104,11 @@ void k_set_rcvbuf(int bufsize, int minsize) + * in the kernel and "panic". The kernel patch for netinet/ip_raw.c + * coming with this distribution fixes it. + */ +-void k_hdr_include(int bool) ++void k_hdr_include(int flag) + { + #ifdef IP_HDRINCL +- if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, &bool, sizeof(bool)) < 0) +- logit(LOG_ERR, errno, "Failed setting socket IP_HDRINCL %u", bool); ++ if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, &flag, sizeof(flag)) < 0) ++ logit(LOG_ERR, errno, "Failed setting socket IP_HDRINCL %u", flag); + #endif + } + diff --git a/package/msgpack-c/Config.in b/package/msgpack-c/Config.in new file mode 100644 index 0000000000..76dfe19614 --- /dev/null +++ b/package/msgpack-c/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_MSGPACK_C + bool "msgpack-c" + help + MessagePack is an efficient binary serialization format. + + It lets you exchange data among multiple languages like JSON + but it's faster and smaller. + + Note: this package is the C variant of msgpack-c. For the + C++ variant, use the "msgpack" Buildroot package. + + https://msgpack.org/ diff --git a/package/msgpack-c/msgpack-c.hash b/package/msgpack-c/msgpack-c.hash new file mode 100644 index 0000000000..e4fe61f424 --- /dev/null +++ b/package/msgpack-c/msgpack-c.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 c23c4070dbe01f46044bf70c5349f29453d655935b6dc710714c008bca0825a7 msgpack-c-6.1.0.tar.gz +sha256 664550b43996452a5a2c7471bb0ff77185a58c69ccafa60f983dc4c162e1ee22 COPYING +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/msgpack-c/msgpack-c.mk b/package/msgpack-c/msgpack-c.mk new file mode 100644 index 0000000000..f12dcb085f --- /dev/null +++ b/package/msgpack-c/msgpack-c.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# msgpack-c +# +################################################################################ + +MSGPACK_C_VERSION = 6.1.0 +MSGPACK_C_SITE = $(call github,msgpack,msgpack-c,c-$(MSGPACK_C_VERSION)) +MSGPACK_C_LICENSE = BSL-1.0 +MSGPACK_C_LICENSE_FILES = COPYING LICENSE_1_0.txt +MSGPACK_C_INSTALL_STAGING = YES +MSGPACK_C_CONF_OPTS = -DMSGPACK_BUILD_EXAMPLES=OFF -DMSGPACK_BUILD_TESTS=OFF + +ifeq ($(BR2_STATIC_LIBS),y) +MSGPACK_C_CONF_OPTS += -DMSGPACK_ENABLE_SHARED=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/msgpack/Config.in b/package/msgpack/Config.in index b7ae35a0c6..da67956a10 100644 --- a/package/msgpack/Config.in +++ b/package/msgpack/Config.in @@ -8,6 +8,9 @@ config BR2_PACKAGE_MSGPACK It lets you exchange data among multiple languages like JSON but it's faster and smaller. + Note: this package is the C++ variant of msgpack. For the + C variant, use the "msgpack-c" Buildroot package. + http://msgpack.org/ comment "msgpack needs a toolchain w/ C++" diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index a7cd70364c..4ac80bb1b2 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.28.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.30.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 3a57f155f54e4860f7dd42138d9bea1af615b99dfab5ab4cd728fc8c09a647a4 msmtp-1.8.28.tar.xz +sha256 f826a3c500c4dfeed814685097cead9b2b3dca5a2ec3897967cb9032570fa9ab msmtp-1.8.30.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index 92fddbe8f3..c391ce8204 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.28 +MSMTP_VERSION = 1.8.30 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf diff --git a/package/ngrep/0005-gcc15.patch b/package/ngrep/0005-gcc15.patch new file mode 100644 index 0000000000..e1dd7785b8 --- /dev/null +++ b/package/ngrep/0005-gcc15.patch @@ -0,0 +1,34 @@ +From 742424ddd76e15bd151e40834e8f1fad65900b65 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 9 Dec 2024 09:44:12 +0000 +Subject: [PATCH] fix build with gcc-15 + +Upstream: https://github.com/jpr5/ngrep/commit/742424ddd76e15bd151e40834e8f1fad65900b65 + +Signed-off-by: Bernd Kuhls +--- + ngrep.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ngrep.c b/ngrep.c +index 3df9389..57b4ddd 100644 +--- a/ngrep.c ++++ b/ngrep.c +@@ -146,7 +146,7 @@ struct re_pattern_buffer pattern; + + char *match_data = NULL, *bin_data = NULL; + uint16_t match_len = 0; +-int8_t (*match_func)() = &blank_match_func; ++int8_t (*match_func)(unsigned char *, uint32_t, uint16_t *, uint16_t *) = &blank_match_func; + + int8_t dump_single = 0; + void (*dump_func)(unsigned char *, uint32_t, uint16_t, uint16_t) = &dump_formatted; +@@ -177,7 +177,7 @@ FD_SET delay_fds; + SOCKET delay_socket = 0; + #endif + +-void (*print_time)() = NULL, (*dump_delay)() = dump_delay_proc_init; ++void (*print_time)(struct pcap_pkthdr *) = NULL, (*dump_delay)(struct pcap_pkthdr *) = dump_delay_proc_init; + + + /* diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 4f6ea20731..e9bce1a01f 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,6 +1,6 @@ -# From https://nmap.org/dist/sigs/nmap-7.95.tar.bz2.digest.txt (lowercase) -sha256 e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778 nmap-7.95.tar.bz2 -sha512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e nmap-7.95.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.97.tar.bz2.digest.txt (lowercase) +sha256 af98f27925c670c257dd96a9ddf2724e06cb79b2fd1e0d08c9206316be1645c0 nmap-7.97.tar.bz2 +sha512 050241744c311f5fc16297e1698aded2a9fdc78eb7a0954d1c70f7713ef6e1b07f3fcbf28a6a53f43785b1ae710aadf10237d1d0bd8855c6b3c423da4d35961c nmap-7.97.tar.bz2 # Locally calculated sha256 9d9a9a763c0e6145172cfe7d8483e23b38ce60b6c79a82e4894242917bdae6d3 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 077840b192..a944627b38 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.95 +NMAP_VERSION = 7.97 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap diff --git a/package/oniguruma/oniguruma.hash b/package/oniguruma/oniguruma.hash index ac1d375b7a..be49a4d4e7 100644 --- a/package/oniguruma/oniguruma.hash +++ b/package/oniguruma/oniguruma.hash @@ -1,4 +1,4 @@ -# From https://github.com/kkos/oniguruma/releases/download/v6.9.9/onig-6.9.9.tar.gz.sha256 -sha256 60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf onig-6.9.9.tar.gz +# From https://github.com/kkos/oniguruma/releases/download/v6.9.10/onig-6.9.10.tar.gz.sha256 +sha256 2a5cfc5ae259e4e97f86b68dfffc152cdaffe94e2060b770cb827238d769fc05 onig-6.9.10.tar.gz # Hash for license file sha256 70ba5469ea0bab6e18a32d7009068f996503168d27be57747e08da34337ff26f COPYING diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index e056048cb5..32eff4cc75 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONIGURUMA_VERSION = 6.9.9 +ONIGURUMA_VERSION = 6.9.10 ONIGURUMA_SITE = \ https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 184444a53a..add8563757 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 22921fd23ca72a21ac5592861d64e7ea53cd8a705fccd73905911f8489519a0b opencl-clhpp-2024.05.08.tar.gz +sha256 51aebe848514b3bc74101036e111f8ee98703649eec7035944831dc6e05cec14 opencl-clhpp-2024.10.24.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 2b5d5afa4b..4bff6ad73a 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,12 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2024.05.08 +# The opencl-headers, opencl-icd-loader, and opencl-clhpp packages +# must always be updated together to compatible versions. +# Version desynchronization may result in build or runtime errors. +# When updating one of them, make sure to check and update the others. + +OPENCL_CLHPP_VERSION = 2024.10.24 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in new file mode 100644 index 0000000000..677349f727 --- /dev/null +++ b/package/opencl-headers/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_OPENCL_HEADERS + bool "opencl-headers" + help + C language headers for the OpenCL API + + https://github.com/KhronosGroup/OpenCL-Headers diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash new file mode 100644 index 0000000000..bd8697e43d --- /dev/null +++ b/package/opencl-headers/opencl-headers.hash @@ -0,0 +1,3 @@ +#Locally generated +sha256 159f2a550592bae49859fee83d372acd152328fdf95c0dcd8b9409f8fad5db93 OpenCL-Headers-2024.10.24.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk new file mode 100644 index 0000000000..388a86e02e --- /dev/null +++ b/package/opencl-headers/opencl-headers.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# opencl-headers +# +################################################################################ + +# The opencl-headers, opencl-icd-loader, and opencl-clhpp packages +# must always be updated together to compatible versions. +# Version desynchronization may result in build or runtime errors. +# When updating one of them, make sure to check and update the others. + +OPENCL_HEADERS_VERSION = 2024.10.24 +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) +OPENCL_HEADERS_LICENSE = Apache-2.0 +OPENCL_HEADERS_LICENSE_FILES = LICENSE +OPENCL_HEADERS_INSTALL_STAGING = YES +OPENCL_HEADERS_INSTALL_TARGET = NO + +define OPENCL_HEADERS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/CL + $(INSTALL) -D -m 0644 $(@D)/CL/* \ + $(STAGING_DIR)/usr/include/CL +endef + +$(eval $(generic-package)) diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in new file mode 100644 index 0000000000..405dc5401a --- /dev/null +++ b/package/opencl-icd-loader/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_OPENCL_ICD_LOADER + bool "OpenCL-ICD-Loader" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBOPENCL + select BR2_PACKAGE_OPENCL_HEADERS + help + OpenCL defines an Installable Client Driver (ICD) mechanism to + allow developers to build applications against an Installable + Client Driver loader (ICD loader) rather than linking their + applications against a specific OpenCL implementation. + + https://github.com/KhronosGroup/OpenCL-ICD-Loader diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash new file mode 100644 index 0000000000..da9f75b63a --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.hash @@ -0,0 +1,3 @@ +# locally generated +sha256 95f2f0cda375b13d2760290df044ebea9c6ff954a7d7faa0867422442c9174dc OpenCL-ICD-Loader-2024.10.24.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk new file mode 100644 index 0000000000..cb3d7e462d --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# opencl-icd-loader +# +################################################################################ + +# The opencl-headers, opencl-icd-loader, and opencl-clhpp packages +# must always be updated together to compatible versions. +# Version desynchronization may result in build or runtime errors. +# When updating one of them, make sure to check and update the others. +OPENCL_ICD_LOADER_VERSION = 2024.10.24 +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE +OPENCL_ICD_LOADER_INSTALL_STAGING = YES + +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers + +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include + +$(eval $(cmake-package)) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index a3855adecd..f8499f5ed2 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ea5cd6e6e2afa6bad938ee770bf0c2cd9317910f37956faeba2869adcf3747d1 polkit-125.tar.gz +sha256 2814a7281989f6baa9e57bd33bbc5e148827e2721ccef22aaf28ab2b376068e8 polkit-126.tar.gz sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index 234e1cf415..653a2819c4 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLKIT_VERSION = 125 +POLKIT_VERSION = 126 POLKIT_SITE = $(call github,polkit-org,polkit,$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING @@ -20,8 +20,7 @@ POLKIT_LDFLAGS = $(TARGET_NLS_LIBS) POLKIT_CONF_OPTS = \ -Dman=false \ -Dexamples=false \ - -Dsession_tracking=ConsoleKit \ - -Djs_engine=duktape + -Dsession_tracking=ConsoleKit ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) POLKIT_CONF_OPTS += -Dintrospection=true diff --git a/package/pppd/0002-pppd-Fix-building-session.c-with-GCC-15.patch b/package/pppd/0002-pppd-Fix-building-session.c-with-GCC-15.patch new file mode 100644 index 0000000000..4fcd492562 --- /dev/null +++ b/package/pppd/0002-pppd-Fix-building-session.c-with-GCC-15.patch @@ -0,0 +1,36 @@ +From fb769c380eeacf23b64cb3bf7860ba49a0e0eed5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Apr 2025 00:15:57 -0700 +Subject: [PATCH] pppd: Fix building session.c with GCC 15 (#553) + +Fixed building with GCC 15 which defaults to C23 +and find conflicting declration of getspnam() here +with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);) + +Fixes +../../ppp-2.5.2/pppd/session.c: In function 'session_start': +../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)' + 185 | struct spwd *getspnam(); + | ^~~~~~~~ + +Signed-off-by: Khem Raj + +Upstream: https://github.com/ppp-project/ppp/commit/fb769c380eeacf23b64cb3bf7860ba49a0e0eed5 + +Signed-off-by: Bernd Kuhls +--- + pppd/session.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pppd/session.c b/pppd/session.c +index f08d8e19..9cc75389 100644 +--- a/pppd/session.c ++++ b/pppd/session.c +@@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char + char *cbuf; + #ifdef HAVE_SHADOW_H + struct spwd *spwd; +- struct spwd *getspnam(); + long now = 0; + #endif /* #ifdef HAVE_SHADOW_H */ + #endif /* #ifdef PPP_WITH_PAM */ diff --git a/package/pppd/0003-pppdump-Fixed-building-with-GCC-15.patch b/package/pppd/0003-pppdump-Fixed-building-with-GCC-15.patch new file mode 100644 index 0000000000..ab7c94e506 --- /dev/null +++ b/package/pppd/0003-pppdump-Fixed-building-with-GCC-15.patch @@ -0,0 +1,76 @@ +From 05361692ee7d6260ce5c04c9fa0e5a1aa7565323 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= +Date: Thu, 27 Feb 2025 23:00:16 +0100 +Subject: [PATCH] pppdump: Fixed building with GCC 15 (#548) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 15 defaults to C23 which does not allow K&R declarations. + +Credit Yaakov Selkowitz in: +https://src.fedoraproject.org/rpms/ppp/pull-request/12 + +Signed-off-by: Jaroslav Škarvada + +Upstream: https://github.com/ppp-project/ppp/commit/05361692ee7d6260ce5c04c9fa0e5a1aa7565323 + +Signed-off-by: Bernd Kuhls +--- + pppdump/pppdump.c | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 deletions(-) + +diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c +index c24208af..1534036c 100644 +--- a/pppdump/pppdump.c ++++ b/pppdump/pppdump.c +@@ -42,14 +42,12 @@ int tot_sent, tot_rcvd; + extern int optind; + extern char *optarg; + +-void dumplog(); +-void dumpppp(); +-void show_time(); ++void dumplog(FILE *); ++void dumpppp(FILE *); ++void show_time(FILE *, int); + + int +-main(ac, av) +- int ac; +- char **av; ++main(int ac, char **av) + { + int i; + char *p; +@@ -97,8 +95,7 @@ main(ac, av) + } + + void +-dumplog(f) +- FILE *f; ++dumplog(FILE *f) + { + int c, n, k, col; + int nb, c2; +@@ -241,8 +238,7 @@ struct pkt { + unsigned char dbuf[8192]; + + void +-dumpppp(f) +- FILE *f; ++dumpppp(FILE *f) + { + int c, n, k; + int nb, nl, dn, proto, rv; +@@ -375,9 +371,7 @@ dumpppp(f) + } + + void +-show_time(f, c) +- FILE *f; +- int c; ++show_time(FILE *f, int c) + { + time_t t; + int n; diff --git a/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch deleted file mode 100644 index e04d191ce0..0000000000 --- a/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 17 Mar 2024 12:36:31 +0100 -Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are - installed as root - -... as this can be considered acceptable when cross-compiling -Privoxy inside an autobuilder with only a root user. - -Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32 -Signed-off-by: Fabrice Fontaine ---- - GNUmakefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/GNUmakefile.in b/GNUmakefile.in -index 04cceb15..cf79aae1 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T - $(ECHO) " and to install the config files as that user and/or group!" ;\ - $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ - $(ECHO) "*******************************************************************" ;\ -- exit 1 ;\ - fi ;\ - else \ - GROUP_T=$(GROUP) ;\ --- -2.39.2 - diff --git a/package/privoxy/0002-GNUMakefile.in-fix-root-install.patch b/package/privoxy/0002-GNUMakefile.in-fix-root-install.patch deleted file mode 100644 index 89347c214e..0000000000 --- a/package/privoxy/0002-GNUMakefile.in-fix-root-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 25bd5ae1664f5603c05c72b2c38525602f33da0a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 31 Mar 2024 19:17:45 +0200 -Subject: [PATCH] GNUMakefile.in: fix root install - -Set GROUP_T when installing configuration files as root to avoid the -following build failure since commit -4b3b267db159dc23314de3062859481b7c397e32: - -/usr/bin/install: missing destination file operand after '/home/buildroot/instance-0/output-1/target/etc' - -Fixes: - - http://autobuild.buildroot.org/results/eb4ccf248c9c5048e9b71058bb0311b1e0763883 - -Signed-off-by: Fabrice Fontaine -Upstream: https://lists.privoxy.org/pipermail/privoxy-devel/2024-March/000760.html ---- - GNUmakefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/GNUmakefile.in b/GNUmakefile.in -index cf79aae1..db1bab59 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -927,6 +927,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T - $(ECHO) " and to install the config files as that user and/or group!" ;\ - $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ - $(ECHO) "*******************************************************************" ;\ -+ GROUP_T=$(GROUP) ;\ - fi ;\ - else \ - GROUP_T=$(GROUP) ;\ --- -2.43.0 - diff --git a/package/privoxy/Config.in b/package/privoxy/Config.in index accb48dfc2..4138c0d281 100644 --- a/package/privoxy/Config.in +++ b/package/privoxy/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PRIVOXY bool "privoxy" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 if !BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help A non-caching web proxy with advanced filtering capabilities diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 67a44f2c94..3c96c5644e 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.34%20%28stable%29/ -sha1 e65298c4ee235320ea9ddfb689187bda29a63bbb privoxy-3.0.34-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/4.0.0%20%28stable%29/ +sha1 d302cb0bf23536e67a1b5505d01486a335d9c4c0 privoxy-4.0.0-stable-src.tar.gz # Locally computed -sha256 e6ccbca1656f4e616b4657f8514e33a70f6697e9d7294356577839322a3c5d2c privoxy-3.0.34-stable-src.tar.gz +sha256 c08e2ba0049307017bf9d8a63dd2a0dfb96aa0cdeb34ae007776e63eba62a26f privoxy-4.0.0-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index e1353ef0c7..64e8fb24db 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,12 +4,12 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.34 +PRIVOXY_VERSION = 4.0.0 PRIVOXY_SITE = https://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped PRIVOXY_AUTORECONF = YES -PRIVOXY_DEPENDENCIES = pcre zlib +PRIVOXY_DEPENDENCIES = $(if $(BR2_PACKAGE_PCRE2),pcre2,pcre) zlib PRIVOXY_LICENSE = GPL-2.0+ PRIVOXY_LICENSE_FILES = LICENSE PRIVOXY_CPE_ID_VENDOR = privoxy diff --git a/package/python-aerich/python-aerich.hash b/package/python-aerich/python-aerich.hash index a2503f899e..bdbea8f66c 100644 --- a/package/python-aerich/python-aerich.hash +++ b/package/python-aerich/python-aerich.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aerich/json -md5 11cc31e2513118e66fc37c833cdeaac8 aerich-0.8.2.tar.gz -sha256 0ed2b15bb017785d17323329e5448b4b12fcfec08a20932626c12aa59a8378d6 aerich-0.8.2.tar.gz +md5 031a5946dcf816e8059459204eb63b65 aerich-0.9.0.tar.gz +sha256 37c7ca71e947e7de3aa0e778cb193fc1faebf9136a0f1108b52b902918b85acc aerich-0.9.0.tar.gz # Locally computed sha256 checksums sha256 4cc00f0e33ac8e089b37d8a1474be441b26311bdc16fe035c75b51201515f617 LICENSE diff --git a/package/python-aerich/python-aerich.mk b/package/python-aerich/python-aerich.mk index 8b54de755a..6c6cea2dfe 100644 --- a/package/python-aerich/python-aerich.mk +++ b/package/python-aerich/python-aerich.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AERICH_VERSION = 0.8.2 +PYTHON_AERICH_VERSION = 0.9.0 PYTHON_AERICH_SOURCE = aerich-$(PYTHON_AERICH_VERSION).tar.gz -PYTHON_AERICH_SITE = https://files.pythonhosted.org/packages/dc/d1/701a44d8f7fdccf700400ce16a26c679b3f4e36de9fb86c3d9f55f64b07f +PYTHON_AERICH_SITE = https://files.pythonhosted.org/packages/2f/4b/1facb78fea47f790040035b94fdcc31630fabe1bda49ebc7a4f374da1757 PYTHON_AERICH_SETUP_TYPE = poetry PYTHON_AERICH_LICENSE = Apache-2.0 PYTHON_AERICH_LICENSE_FILES = LICENSE diff --git a/package/python-aiomqtt/python-aiomqtt.hash b/package/python-aiomqtt/python-aiomqtt.hash index 12ea86d538..eab5a1938f 100644 --- a/package/python-aiomqtt/python-aiomqtt.hash +++ b/package/python-aiomqtt/python-aiomqtt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiomqtt/json -md5 e23feb8ad69a1ae3a9701fb1f3c03a3c aiomqtt-2.3.0.tar.gz -sha256 312feebe20bc76dc7c20916663011f3bd37aa6f42f9f687a19a1c58308d80d47 aiomqtt-2.3.0.tar.gz +md5 9ded3fea036dc979d7855a6b3fd1dc33 aiomqtt-2.4.0.tar.gz +sha256 ab0f18fc5b7ffaa57451c407417d674db837b00a9c7d953cccd02be64f046c17 aiomqtt-2.4.0.tar.gz # Locally computed sha256 checksums sha256 2cdee9e997c759749069649dfb9060fdb885da82bc50c0dcb4841b1dcab0b032 LICENSE diff --git a/package/python-aiomqtt/python-aiomqtt.mk b/package/python-aiomqtt/python-aiomqtt.mk index 80cecea9e8..c5b932838d 100644 --- a/package/python-aiomqtt/python-aiomqtt.mk +++ b/package/python-aiomqtt/python-aiomqtt.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_AIOMQTT_VERSION = 2.3.0 +PYTHON_AIOMQTT_VERSION = 2.4.0 PYTHON_AIOMQTT_SOURCE = aiomqtt-$(PYTHON_AIOMQTT_VERSION).tar.gz -PYTHON_AIOMQTT_SITE = https://files.pythonhosted.org/packages/db/c9/168e78bd35b21d9bdbb26178db33a8f265e4a69bb4193e72434e7cb3d1cd -PYTHON_AIOMQTT_SETUP_TYPE = poetry +PYTHON_AIOMQTT_SITE = https://files.pythonhosted.org/packages/45/9a/863bc34c64bc4acb9720a9950bfc77d6f324640cdf1f420bb5d9ee624975 +PYTHON_AIOMQTT_SETUP_TYPE = hatch PYTHON_AIOMQTT_LICENSE = BSD-3-Clause PYTHON_AIOMQTT_LICENSE_FILES = LICENSE -PYTHON_AIOMQTT_DEPENDENCIES = host-python-poetry-dynamic-versioning $(eval $(python-package)) diff --git a/package/python-dunamai/python-dunamai.hash b/package/python-dunamai/python-dunamai.hash deleted file mode 100644 index 9c0fcc1810..0000000000 --- a/package/python-dunamai/python-dunamai.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/dunamai/json -md5 5aa5f8aa470a4e8f67430b1a8a6ff801 dunamai-1.23.0.tar.gz -sha256 a163746de7ea5acb6dacdab3a6ad621ebc612ed1e528aaa8beedb8887fccd2c4 dunamai-1.23.0.tar.gz -# Locally computed sha256 checksums -sha256 cd75c5564078e3aadf662a9df3d23430f4705dfeedebbd0ebbeef53998ad94a8 LICENSE diff --git a/package/python-dunamai/python-dunamai.mk b/package/python-dunamai/python-dunamai.mk deleted file mode 100644 index ba422f5b2f..0000000000 --- a/package/python-dunamai/python-dunamai.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dunamai -# -################################################################################ - -PYTHON_DUNAMAI_VERSION = 1.23.0 -PYTHON_DUNAMAI_SOURCE = dunamai-$(PYTHON_DUNAMAI_VERSION).tar.gz -PYTHON_DUNAMAI_SITE = https://files.pythonhosted.org/packages/06/4e/a5c8c337a1d9ac0384298ade02d322741fb5998041a5ea74d1cd2a4a1d47 -PYTHON_DUNAMAI_SETUP_TYPE = poetry -PYTHON_DUNAMAI_LICENSE = MIT -PYTHON_DUNAMAI_LICENSE_FILES = LICENSE -HOST_PYTHON_DUNAMAI_DEPENDENCIES = host-python-packaging - -$(eval $(host-python-package)) diff --git a/package/python-gobject/0001-gi.events._Selector.get_map-look-up-file-objects-by-.patch b/package/python-gobject/0001-gi.events._Selector.get_map-look-up-file-objects-by-.patch index baed785aa5..a275abd9c7 100644 --- a/package/python-gobject/0001-gi.events._Selector.get_map-look-up-file-objects-by-.patch +++ b/package/python-gobject/0001-gi.events._Selector.get_map-look-up-file-objects-by-.patch @@ -1,4 +1,4 @@ -From 3bb03bc5d095cf51c8605521fcc2ce8cad36995f Mon Sep 17 00:00:00 2001 +From 4b97688d527276fc1e835fed71dbb73bbd09ac11 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Tue, 25 Mar 2025 13:29:04 +0100 Subject: [PATCH] gi.events._Selector.get_map(): look up file objects by file @@ -9,15 +9,16 @@ equivalent for lookup, or one may incorrectly be treated as not registered when the other was used for the registration, leading to bugs. +Fixes: #689 Signed-off-by: Fiona Klute -Upstream: https://gitlab.gnome.org/GNOME/pygobject/-/commit/3bb03bc5d095cf51c8605521fcc2ce8cad36995f +Upstream: https://gitlab.gnome.org/GNOME/pygobject/-/commit/4b97688d527276fc1e835fed71dbb73bbd09ac11 --- gi/events.py | 36 +++++++++++++++++++++----- tests/test_events.py | 61 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 7 deletions(-) diff --git a/gi/events.py b/gi/events.py -index 9f00059ec..980cae0fe 100644 +index da4775dc..9eba1629 100644 --- a/gi/events.py +++ b/gi/events.py @@ -28,6 +28,7 @@ import threading @@ -28,7 +29,7 @@ index 9f00059ec..980cae0fe 100644 from contextlib import contextmanager from . import _ossighelper -@@ -381,9 +382,33 @@ if sys.platform != 'win32': +@@ -508,9 +509,33 @@ if sys.platform != 'win32': # Subclass to attach _tag pass @@ -62,7 +63,7 @@ index 9f00059ec..980cae0fe 100644 def attach(self): self._source.attach(self._loop._context) -@@ -432,15 +457,12 @@ if sys.platform != 'win32': +@@ -559,15 +584,12 @@ if sys.platform != 'win32': # We could override modify, but it is only slightly when the "events" change. def get_key(self, fileobj): @@ -83,21 +84,21 @@ index 9f00059ec..980cae0fe 100644 else: diff --git a/tests/test_events.py b/tests/test_events.py -index 81409abae..c075af095 100644 +index a6585468..9dbf3827 100644 --- a/tests/test_events.py +++ b/tests/test_events.py -@@ -45,6 +45,7 @@ import sys +@@ -46,6 +46,7 @@ import sys import gi import gi.events import asyncio +import socket import threading - from gi.repository import GLib + from gi.repository import GLib, Gio -@@ -262,3 +263,63 @@ class GLibEventLoopPolicyTests(unittest.TestCase): - GLib.MainLoop().run() - - loop.close() +@@ -344,3 +345,63 @@ class GLibEventLoopPolicyTests(unittest.TestCase): + self.assertEqual(order, [GLib.PRIORITY_HIGH] * 3 + + [GLib.PRIORITY_DEFAULT] * 3 + + [GLib.PRIORITY_DEFAULT_IDLE] * 3) + + @unittest.skipIf(sys.platform == 'win32', 'add reader/writer not implemented') + def test_source_fileobj_fd(self): @@ -159,5 +160,5 @@ index 81409abae..c075af095 100644 + loop.run_until_complete(run()) + loop.close() -- -GitLab +2.49.0 diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 1dbd40d038..e49c7ddd08 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from https://download.gnome.org/sources/pygobject/3.50/pygobject-3.50.0.sha256sum -sha256 8d836e75b5a881d457ee1622cae4a32bcdba28a0ba562193adb3bbb472472212 pygobject-3.50.0.tar.xz +# from https://download.gnome.org/sources/pygobject/3.52/pygobject-3.52.3.sha256sum +sha256 00e427d291e957462a8fad659a9f9c8be776ff82a8b76bdf402f1eaeec086d82 pygobject-3.52.3.tar.gz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index 001f355844..3021937887 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOBJECT_VERSION_MAJOR = 3.50 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).0 -PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz +PYTHON_GOBJECT_VERSION_MAJOR = 3.52 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).3 +PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.gz PYTHON_GOBJECT_SITE = https://download.gnome.org/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ PYTHON_GOBJECT_LICENSE_FILES = COPYING diff --git a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash deleted file mode 100644 index 7e0675cabb..0000000000 --- a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/poetry-dynamic-versioning/json -md5 d3d35766974dc0e040d73f7dcc15cc5f poetry_dynamic_versioning-1.6.0.tar.gz -sha256 568b728eeb7b2c4a3b818565bbaffc2128bde68ad037152d464b92975f45ce70 poetry_dynamic_versioning-1.6.0.tar.gz -# Locally computed sha256 checksums -sha256 cd75c5564078e3aadf662a9df3d23430f4705dfeedebbd0ebbeef53998ad94a8 LICENSE diff --git a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk deleted file mode 100644 index 6ff596bca2..0000000000 --- a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python-poetry-dynamic-versioning -# -################################################################################ - -PYTHON_POETRY_DYNAMIC_VERSIONING_VERSION = 1.6.0 -PYTHON_POETRY_DYNAMIC_VERSIONING_SOURCE = poetry_dynamic_versioning-$(PYTHON_POETRY_DYNAMIC_VERSIONING_VERSION).tar.gz -PYTHON_POETRY_DYNAMIC_VERSIONING_SITE = https://files.pythonhosted.org/packages/d3/f9/97b14cae52513ee028f1e81aad8a44e3a8f5a5d47570b48219431e131989 -PYTHON_POETRY_DYNAMIC_VERSIONING_SETUP_TYPE = poetry -PYTHON_POETRY_DYNAMIC_VERSIONING_LICENSE = MIT -PYTHON_POETRY_DYNAMIC_VERSIONING_LICENSE_FILES = LICENSE -HOST_PYTHON_POETRY_DYNAMIC_VERSIONING_DEPENDENCIES = \ - host-python-dunamai \ - host-python-jinja2 \ - host-python-tomlkit - -$(eval $(host-python-package)) diff --git a/package/python-sdbus-modemmanager/Config.in b/package/python-sdbus-modemmanager/Config.in new file mode 100644 index 0000000000..bf2759b4fc --- /dev/null +++ b/package/python-sdbus-modemmanager/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_SDBUS_MODEMMANAGER + bool "python-sdbus-modemmanager" + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_PACKAGE_MODEM_MANAGER # runtime + select BR2_PACKAGE_PYTHON_SDBUS # runtime + help + ModemManager bindings for sdbus. + + https://github.com/zhanglongqi/python-sdbus-modemmanager + +comment "python-sdbus-modemmanager needs systemd and modem-manager" + depends on !BR2_PACKAGE_SYSTEMD || !BR2_PACKAGE_MODEM_MANAGER diff --git a/package/python-sdbus-modemmanager/python-sdbus-modemmanager.hash b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.hash new file mode 100644 index 0000000000..980568cb0d --- /dev/null +++ b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sdbus-modemmanager/json +md5 720d59e444d84d77c184bc73844cfebd sdbus_modemmanager-1.0.2.tar.gz +sha256 80ed83a158eeb8d9b0e0c1e5110c5f71307df87523245e4d0e79ebe200932fc6 sdbus_modemmanager-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/python-sdbus-modemmanager/python-sdbus-modemmanager.mk b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.mk new file mode 100644 index 0000000000..2821453270 --- /dev/null +++ b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sdbus-modemmanager +# +################################################################################ + +PYTHON_SDBUS_MODEMMANAGER_VERSION = 1.0.2 +PYTHON_SDBUS_MODEMMANAGER_SOURCE = sdbus_modemmanager-$(PYTHON_SDBUS_MODEMMANAGER_VERSION).tar.gz +PYTHON_SDBUS_MODEMMANAGER_SITE = https://files.pythonhosted.org/packages/af/99/a17942d9abda13ad1f27f39e900e39852a6215b70e30b682b777dfeff818 +PYTHON_SDBUS_MODEMMANAGER_SETUP_TYPE = setuptools +PYTHON_SDBUS_MODEMMANAGER_LICENSE = LGPL-2.1+ +PYTHON_SDBUS_MODEMMANAGER_LICENSE_FILES = COPYING.LESSER + +$(eval $(python-package)) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index c66ee44e91..93f6bb35ab 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 4aecb8d3b1d077d6099c1f8ed18367a4 sqlalchemy-2.0.39.tar.gz -sha256 5d2d1fe548def3267b4c70a8568f108d1fed7cbbeccb9cc166e05af2abc25c22 sqlalchemy-2.0.39.tar.gz +md5 76ade8b13f77b9ceaff6c91f5617c668 sqlalchemy-2.0.41.tar.gz +sha256 edba70118c4be3c2b1f90754d308d0b79c6fe2c0fdc52d8ddf603916f83f4db9 sqlalchemy-2.0.41.tar.gz # Locally computed sha256 checksums sha256 9821720b58d4a565b61321007a8ad43ab6991a3959e66cd5db4dd9eae69c7dfc LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 26d7d308b9..10a9f16b66 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.39 +PYTHON_SQLALCHEMY_VERSION = 2.0.41 PYTHON_SQLALCHEMY_SOURCE = sqlalchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/00/8e/e77fcaa67f8b9f504b4764570191e291524575ddbfe78a90fc656d671fdc +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/63/66/45b165c595ec89aa7dcc2c1cd222ab269bc753f1fc7a1e68f8481bd957bf PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index a7ba8f899f..cf52729bb3 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 c3a490d9cea9360ecd0805e4c2d1e87e tornado-6.4.2.tar.gz -sha256 92bad5b4746e9879fd7bf1eb21dce4e3fc5128d71601f80005afa39237ad620b tornado-6.4.2.tar.gz +md5 a14a7d70e304fcf96f06ccc2db98b98d tornado-6.5.tar.gz +sha256 c70c0a26d5b2d85440e4debd14a8d0b463a0cf35d92d3af05f5f1ffa8675c826 tornado-6.5.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 0a33a57ed4..f5b4609e0d 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.4.2 +PYTHON_TORNADO_VERSION = 6.5 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/59/45/a0daf161f7d6f36c3ea5fc0c2de619746cc3dd4c76402e9db545bd920f63 +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/63/c4/bb3bd68b1b3cd30abc6411469875e6d32004397ccc4a3230479f86f86a73 PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb diff --git a/package/python-tortoise-orm/python-tortoise-orm.hash b/package/python-tortoise-orm/python-tortoise-orm.hash index db7e37c13e..7538056cd0 100644 --- a/package/python-tortoise-orm/python-tortoise-orm.hash +++ b/package/python-tortoise-orm/python-tortoise-orm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tortoise-orm/json -md5 fa3177acfcd186ccdef0936dabc79f90 tortoise_orm-0.24.2.tar.gz -sha256 83d2373efafc1c5d668c3c5bd4e1e7f4a219526e850909ffe88f184da3808fdb tortoise_orm-0.24.2.tar.gz +md5 4ae41f379c4ede60df7705d1c7fe71b5 tortoise_orm-0.25.0.tar.gz +sha256 7d0aaf31c33a25a9efad8f94b44ee50febae15889f4da119cf184ffe98002673 tortoise_orm-0.25.0.tar.gz # Locally computed sha256 checksums sha256 f955d347b975d5867ee364f978476b3012878a706d468571b9758cac74de6041 LICENSE.txt diff --git a/package/python-tortoise-orm/python-tortoise-orm.mk b/package/python-tortoise-orm/python-tortoise-orm.mk index e3c1fd5d90..bf250007ce 100644 --- a/package/python-tortoise-orm/python-tortoise-orm.mk +++ b/package/python-tortoise-orm/python-tortoise-orm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORTOISE_ORM_VERSION = 0.24.2 +PYTHON_TORTOISE_ORM_VERSION = 0.25.0 PYTHON_TORTOISE_ORM_SOURCE = tortoise_orm-$(PYTHON_TORTOISE_ORM_VERSION).tar.gz -PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/49/e8/ac7cc41c297f20b3642351e5ff16f53beddea37be285f33f30308838d704 +PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/d8/02/89777797d2c74386e21fca4a879d15eef6a0a789e4b9564355e94c367e6e PYTHON_TORTOISE_ORM_SETUP_TYPE = poetry PYTHON_TORTOISE_ORM_LICENSE = Apache-2.0 PYTHON_TORTOISE_ORM_LICENSE_FILES = LICENSE.txt diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 157cbe30bd..49f0a1c9e3 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 02fa197d21d519f5a25a928deb9397cd387ba7382b9b449782ba31d8f3118206 rsyslog-8.2502.0.tar.gz +sha256 5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab rsyslog-8.2504.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 4f86bb68da..a7cebcb412 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2502.0 +RSYSLOG_VERSION = 8.2504.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index f84be14b7c..e7418b4cd0 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1f28db84937010a754ac84c21831fe06547f7add0be11f1c517cf7c81cf45fc7 rtl8821cu-96c65c58b544241178638e810b333dcc9aa26b91.tar.gz +sha256 6b4bf57959d14ad1a2637a0385876c6fb319d6e4951986bbba18de3c0e65bb86 rtl8821cu-d74134a1c68f59f2b80cdd6c6afb8c1a8a687cbf.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index ee15910c7c..ac53b65fda 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = 96c65c58b544241178638e810b333dcc9aa26b91 +RTL8821CU_VERSION = d74134a1c68f59f2b80cdd6c6afb8c1a8a687cbf RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE diff --git a/package/sipeed-lpi4abin/sipeed-lpi4abin.hash b/package/sipeed-lpi4abin/sipeed-lpi4abin.hash index 9d66be164b..7281f38cd2 100644 --- a/package/sipeed-lpi4abin/sipeed-lpi4abin.hash +++ b/package/sipeed-lpi4abin/sipeed-lpi4abin.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a1c608a7b0cc641d39666a07d8bb1a73ded35385316989c3e8182d968ed89b3e sipeed-lpi4abin-44ec4e1cc82141963842ec45db0d1617f9f07e75-git4.tar.gz +sha256 c0c2daed3c56ba30a26d81986dfa041101c58db994372d601f126cab8fa01013 sipeed-lpi4abin-725756411ecc20f2c2dbc5ea6b8e5aacc6f83aad-git4.tar.gz diff --git a/package/sipeed-lpi4abin/sipeed-lpi4abin.mk b/package/sipeed-lpi4abin/sipeed-lpi4abin.mk index f2338576d8..59ef9ff918 100644 --- a/package/sipeed-lpi4abin/sipeed-lpi4abin.mk +++ b/package/sipeed-lpi4abin/sipeed-lpi4abin.mk @@ -4,7 +4,7 @@ # ################################################################################ -SIPEED_LPI4ABIN_VERSION = 44ec4e1cc82141963842ec45db0d1617f9f07e75 +SIPEED_LPI4ABIN_VERSION = 725756411ecc20f2c2dbc5ea6b8e5aacc6f83aad SIPEED_LPI4ABIN_SITE = https://github.com/revyos/th1520-boot-firmware.git SIPEED_LPI4ABIN_SITE_METHOD = git SIPEED_LPI4ABIN_LICENSE = PROPRIETARY diff --git a/package/spirv-headers/spirv-headers.hash b/package/spirv-headers/spirv-headers.hash index 136f3df733..6e3cc33d6b 100644 --- a/package/spirv-headers/spirv-headers.hash +++ b/package/spirv-headers/spirv-headers.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32b4c6ae6a2fa9b56c2c17233c8056da47e331f76e117729925825ea3e77a739 spirv-headers-1.3.261.1.tar.gz -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a LICENSE +sha256 f68be549d74afb61600a1e3a7d1da1e6b7437758c8e77d664909f88f302c5ac1 spirv-headers-1.4.313.0.tar.gz +sha256 ff04ae7e6a468587fe59434fee2e67c0e2a749b592c794b764ff80f30b94a084 LICENSE diff --git a/package/spirv-headers/spirv-headers.mk b/package/spirv-headers/spirv-headers.mk index 9f84c42b2d..675cef9f16 100644 --- a/package/spirv-headers/spirv-headers.mk +++ b/package/spirv-headers/spirv-headers.mk @@ -5,8 +5,8 @@ ################################################################################ # Keep in sync with spirv-tools version -SPIRV_HEADERS_VERSION = 1.3.261.1 -SPIRV_HEADERS_SITE = $(call github,KhronosGroup,SPIRV-Headers,sdk-$(SPIRV_HEADERS_VERSION)) +SPIRV_HEADERS_VERSION = 1.4.313.0 +SPIRV_HEADERS_SITE = $(call github,KhronosGroup,SPIRV-Headers,vulkan-sdk-$(SPIRV_HEADERS_VERSION)) SPIRV_HEADERS_LICENSE = MIT SPIRV_HEADERS_LICENSE_FILES = LICENSE diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash index 4500fc4f62..6cd47762f7 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.hash +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 0a00a72a5b004eeb73f9c96c9c6ba2d6de232cbf3c22a7b322047604d24402ba spirv-llvm-translator-v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c6e63.tar.gz +sha256 ca89c35cbc55cfe69ab9fa1a2f3ee585d30cb285e01e2cae309fe0e1f1dfd79e spirv-llvm-translator-v20.1.2-7-g834db1a1985ac36d5a3e1b4b34dc1ca3f919ad5b.tar.gz sha256 e3bc36440fc927c62d5cc24efeefe225a14d4e34ffeb0c92e430625cce9ee444 LICENSE.TXT diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk index ffc8a63b89..6ba58c392f 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -5,8 +5,8 @@ ################################################################################ # Generate version string using: -# git describe --tags --match 'v15*' --abbrev=40 origin/llvm_release_150 -SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c6e63 +# git describe --tags --match 'v20*' --abbrev=40 origin/llvm_release_200 +SPIRV_LLVM_TRANSLATOR_VERSION = v20.1.2-7-g834db1a1985ac36d5a3e1b4b34dc1ca3f919ad5b SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT diff --git a/package/spirv-tools/spirv-tools.hash b/package/spirv-tools/spirv-tools.hash index 65cb9c619b..de118b378e 100644 --- a/package/spirv-tools/spirv-tools.hash +++ b/package/spirv-tools/spirv-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ead95c626ad482882a141d1aa0ce47b9453871f72c42c0b28d39c82f60a52008 spirv-tools-1.3.261.1.tar.gz +sha256 6b60f723345ceed5291cceebbcfacf7fea9361a69332261fa08ae57e2a562005 spirv-tools-1.4.313.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/spirv-tools/spirv-tools.mk b/package/spirv-tools/spirv-tools.mk index 51b1c9f22a..1aa0cc6199 100644 --- a/package/spirv-tools/spirv-tools.mk +++ b/package/spirv-tools/spirv-tools.mk @@ -5,8 +5,8 @@ ################################################################################ # Keep in sync with spirv-headers version -SPIRV_TOOLS_VERSION = 1.3.261.1 -SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,sdk-$(SPIRV_TOOLS_VERSION)) +SPIRV_TOOLS_VERSION = 1.4.313.0 +SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,vulkan-sdk-$(SPIRV_TOOLS_VERSION)) SPIRV_TOOLS_LICENSE = Apache-2.0 SPIRV_TOOLS_LICENSE_FILES = LICENSE SPIRV_TOOLS_DEPENDENCIES = spirv-headers diff --git a/package/sqlitecpp/sqlitecpp.hash b/package/sqlitecpp/sqlitecpp.hash index 3ed6a3c40a..960d9bfb21 100644 --- a/package/sqlitecpp/sqlitecpp.hash +++ b/package/sqlitecpp/sqlitecpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5aa8eda130d0689bd5ed9b2074714c2dbc610f710483c61ba6cf944cebfe03af sqlitecpp-3.3.2.tar.gz -sha256 ecb10f021c51e9fd1dabaebd8a8e977934d47d9e3c74094f333060be2d6e023b LICENSE.txt +sha256 33bd4372d83bc43117928ee842be64d05e7807f511b5195f85d30015cad9cac6 sqlitecpp-3.3.3.tar.gz +sha256 a16149966042207bfc968dd1081403d43a37a6264fe31c7b1a7960dbb0e716b9 LICENSE.txt diff --git a/package/sqlitecpp/sqlitecpp.mk b/package/sqlitecpp/sqlitecpp.mk index 1cf8281997..95ddc953cb 100644 --- a/package/sqlitecpp/sqlitecpp.mk +++ b/package/sqlitecpp/sqlitecpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITECPP_VERSION = 3.3.2 +SQLITECPP_VERSION = 3.3.3 SQLITECPP_SITE = $(call github,SRombauts,SQLiteCpp,$(SQLITECPP_VERSION)) SQLITECPP_LICENSE = MIT SQLITECPP_LICENSE_FILES = LICENSE.txt diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 10de7e7563..9bccae7108 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.14/strace-6.14.tar.xz.asc -sha256 244f3b5c20a32854ca9b7ca7a3ee091dd3d4bd20933a171ecee8db486c77d3c9 strace-6.14.tar.xz +# https://strace.io/files/6.15/strace-6.15.tar.xz.asc +sha256 8552dfab08abc22a0f2048c98fd9541fd4d71b6882507952780dab7c7c512f51 strace-6.15.tar.xz sha256 ca2a0994c57e48b16828008c80cdb626e471b6b59116a8443b2ce4e3c77ddc3b COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index ee0e7dcf4a..bd7d73c78c 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.14 +STRACE_VERSION = 6.15 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch deleted file mode 100644 index 446f1d1797..0000000000 --- a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 17 Feb 2024 17:52:45 +0100 -Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() - -Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) -broke the build on C libraries that miss process_vm_readv(), like -uClibc-ng. - -Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, -but is then re-assigned and used a few lines below, outside any guard. - -Fix that by always declaring the object, as it is always needed. - -Signed-off-by: Yann E. MORIN -Upstream: https://github.com/sudo-project/sudo/commit/5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c ---- - src/exec_ptrace.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c -index 9dd36c275..3d44b82e2 100644 ---- a/src/exec_ptrace.c -+++ b/src/exec_ptrace.c -@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, - unsigned long addr, unsigned long strtab) - { - const unsigned long strtab0 = strtab; -+ ssize_t nwritten; - size_t i; - debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); - - #ifdef HAVE_PROCESS_VM_READV -- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); -+ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); - if (nwritten != -1 || errno != ENOSYS) - debug_return_ssize_t(nwritten); - #endif /* HAVE_PROCESS_VM_READV */ --- -2.43.0 - diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 066d3b9de6..ed4e527f36 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558 sudo-1.9.15p5.tar.gz +sha256 976aa56d3e3b2a75593307864288addb748c9c136e25d95a9cc699aafa77239c sudo-1.9.16p2.tar.gz # Locally calculated -sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md +sha256 a6e4ec823f2ba58f840b0ff5fc5459e4893f46a91bbcd6b2a2d91315de5a2d2b LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 7961a99002..1fe713ab2d 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.15 -SUDO_VERSION_MINOR = p5 +SUDO_VERSION_MAJOR = 1.9.16 +SUDO_VERSION_MINOR = p2 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 851b91aeba..320d416203 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -52,9 +52,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Kernel versions below 4.15 ("recommended baseline") have + Kernel versions below 5.4 ("recommended baseline") have significant gaps in functionality and are not recommended - for use with this version of systemd. + for use with this version of systemd. (e.g. lack race-free + process tracking by pidfd, systemd-networkd, and new mount + API support). Systemd requires a Linux kernel >= 3.15 with the following options enabled: @@ -354,7 +356,8 @@ config BR2_PACKAGE_SYSTEMD_MYHOSTNAME config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" - default y + default y if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 help systemd-networkd is a system service that manages networks. It detects and configures network devices as they appear, as @@ -365,6 +368,9 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD https://www.freedesktop.org/software/systemd/man/systemd-networkd.html +comment "systemd-networkd needs a toolchain with kernel headers >= 5.4" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + config BR2_PACKAGE_SYSTEMD_OOMD bool "enable out-of-memory killer" help diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 976d88c1f5..ca7ff360b5 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,7 +1,8 @@ # sha256 locally computed -sha256 896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0 systemd-256.7.tar.gz +sha256 4d65f9482608cf9f7823df42a6d7796f0e0dfcfb94301df75effff86d40da33e systemd-257.5.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 +sha256 c9e7bf5b7c243c719b8b43c36158effb9b54c5e80abc9d82e4b2d4b2a4aa64ad LICENSES/alg-sha1-public-domain.txt sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 LICENSES/BSD-3-Clause.txt sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSES/CC0-1.0.txt @@ -12,4 +13,4 @@ sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENS sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 3df2dfbb09215ab1aecdd3c91d7fbe02fee4a0e75ef8967a25d1a6fe3b8abc06 LICENSES/README.md +sha256 8f3141489df84100440efa9911603e83757ff97f26f737e1d7fa2b25207a7905 LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 71fe0de550..fa57894369 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 256.7 +SYSTEMD_VERSION = 257.5 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -35,6 +35,7 @@ SYSTEMD_LICENSE = \ SYSTEMD_LICENSE_FILES = \ LICENSE.GPL2 \ LICENSE.LGPL2.1 \ + LICENSES/alg-sha1-public-domain.txt \ LICENSES/BSD-2-Clause.txt \ LICENSES/BSD-3-Clause.txt \ LICENSES/CC0-1.0.txt \ @@ -73,6 +74,7 @@ SYSTEMD_CONF_OPTS += \ -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ + -Dipe=false \ -Dkexec-path=/usr/sbin/kexec \ -Dkmod-path=/usr/bin/kmod \ -Dldconfig=false \ @@ -99,6 +101,7 @@ SYSTEMD_CONF_OPTS += \ -Dfuzz-tests=false \ -Dinstall-tests=false \ -Dlog-message-verification=disabled \ + -Dsysupdated=disabled \ -Dtmpfiles=true \ -Dukify=disabled \ -Dbpf-framework=disabled \ @@ -1011,7 +1014,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dopenssl=disabled \ -Dp11kit=disabled \ -Dlibfido2=disabled \ - -Dpcre2=disabled + -Dpcre2=disabled \ + -Dsysupdated=disabled HOST_SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ diff --git a/package/sysvinit/sysvinit.hash b/package/sysvinit/sysvinit.hash index e806ad3786..8de1efed40 100644 --- a/package/sysvinit/sysvinit.hash +++ b/package/sysvinit/sysvinit.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 cbaeabddc35a6511b87c87452ee5e87c678a26329c7d7d17fb69a2b42a314d86 sysvinit-3.13.tar.xz +sha256 c90874b8c054a35991fb8c4d30c443ed1e9b1815ff6165c7b483f558be4e4b53 sysvinit-3.14.tar.xz # Hash for license files: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index e0eabc933c..7e73432ea2 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSVINIT_VERSION = 3.13 +SYSVINIT_VERSION = 3.14 SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = https://github.com/slicer69/sysvinit/releases/download/$(SYSVINIT_VERSION) SYSVINIT_LICENSE = GPL-2.0+ diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 3318d4614f..4ca325b2d7 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ef2c9019f3e292f77e274a95386e550cb8c358ec0e053f6b7097565f61381e01 timescaledb-2.19.3.tar.gz +sha256 b6ac4c29ef29e93249fcc25bf193dab2637422797360b12e00fd73067138a953 timescaledb-2.20.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 024a72d4f4..00e2eb81ea 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.19.3 +TIMESCALEDB_VERSION = 2.20.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE @@ -23,6 +23,7 @@ TIMESCALEDB_CONF_OPTS = \ -DPG_PKGLIBDIR=lib/postgresql \ -DPG_SHAREDIR=share/postgresql \ -DPG_BINDIR=bin \ + -DPG_PATH="$(STAGING_DIR)/usr" \ -DPG_CPPFLAGS="$(TARGET_CPPFLAGS) " \ -DPG_CFLAGS="$(TARGET_CFLAGS) " \ -DPG_LDFLAGS="$(TARGET_LDFLAGS) " \ diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 9ef48b1e77..16ada077f3 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5 tree-2.1.1.tgz +sha256 68ac45dc78c0c311ada06200ffc3c285e74223ba208061f8d15ffac25e44b2ec tree-2.2.1.tgz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 479a172a72..4b48f4cf48 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 2.1.1 +TREE_VERSION = 2.2.1 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://oldmanprogrammer.net/tar/tree TREE_LICENSE = GPL-2.0+ diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 765a2438c2..0bd9ee9889 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,5 +1,5 @@ # From https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-versions.xml -md5 69d00d6ed7097b97d972a159d14cfba1 usb-modeswitch-2.6.1.tar.bz2 +md5 cf3b9f052fe49b02b385848eedc7264f usb-modeswitch-2.6.2.tar.bz2 # Locally calculated -sha256 5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34 usb-modeswitch-2.6.1.tar.bz2 +sha256 f7abd337784a9d1bd39cb8a587518aff6f2a43d916145eafd80b1b8b7146db66 usb-modeswitch-2.6.2.tar.bz2 sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index f2ee004b42..aa5646adee 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.6.1 +USB_MODESWITCH_VERSION = 2.6.2 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash index 98d2d4b60a..30c8735901 100644 --- a/package/ustreamer/ustreamer.hash +++ b/package/ustreamer/ustreamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71aaba1427e8bb690500f1ae940aa64c3b3f7253750448c1331fad3b31500f3e ustreamer-6.36.tar.gz +sha256 b134bd9e291d2e7222e135f9b1b22f89ebf7c78c9c22333a4046a21365f87b2e ustreamer-6.37.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk index dd1369c121..abbeac2382 100644 --- a/package/ustreamer/ustreamer.mk +++ b/package/ustreamer/ustreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -USTREAMER_VERSION = 6.36 +USTREAMER_VERSION = 6.37 USTREAMER_SITE = $(call github,pikvm,ustreamer,v$(USTREAMER_VERSION)) USTREAMER_LICENSE = GPL-3.0+ USTREAMER_LICENSE_FILES = LICENSE diff --git a/package/uuu/Config.in b/package/uuu/Config.in new file mode 100644 index 0000000000..6085183ea7 --- /dev/null +++ b/package/uuu/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_UUU + bool "uuu" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR # libuuu uses wchar_t + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_TINYXML2 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZSTD + help + UUU (Universal Update Utility) is Freescale/NXP I.MX Chip + image deploy tool. UUU is an evolution of MFGTools + (aka MFGTools v3). + + https://github.com/nxp-imx/mfgtools + +comment "uuu needs a toolchain w/ C++14, threads, atomic, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_ATOMIC \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 4683cbeec1..93d0b97b13 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -9,6 +9,7 @@ UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/nxp-imx/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE +UUU_DEPENDENCIES = bzip2 libusb openssl tinyxml2 zlib zstd HOST_UUU_DEPENDENCIES = \ host-bzip2 \ host-libusb \ @@ -17,4 +18,9 @@ HOST_UUU_DEPENDENCIES = \ host-zlib \ host-zstd +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +UUU_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +$(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index af45bce9a5..848421f091 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,7 +1,7 @@ # From https://valgrind.org/downloads/current.html -sha1 5939b8360d272e89bc7b2fcf5213e57a2080afaf valgrind-3.25.0.tar.bz2 +sha1 4d2cc4d527213f81af573bca4d2cb93ccac7f274 valgrind-3.25.1.tar.bz2 # locally computed -sha256 295f60291d6b64c0d90c1ce645634bdc5361d39b0c50ecf9de6385ee77586ecc valgrind-3.25.0.tar.bz2 +sha256 61deb8d0727b45c268efdc1b3b6c9e679cd97cbf5ee4b28d1dead7c8b7a271af valgrind-3.25.1.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 791ba2b504..73568932a0 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.25.0 +VALGRIND_VERSION = 3.25.1 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 diff --git a/package/vnstat/vnstat.hash b/package/vnstat/vnstat.hash index 87d2a6d687..dcd4920619 100644 --- a/package/vnstat/vnstat.hash +++ b/package/vnstat/vnstat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 babc3f1583cc40e4e8ffb2f53296d93d308cb5a5043e85054f6eaf7b4ae57856 vnstat-2.11.tar.gz +sha256 c9fe19312d1ec3ddfbc4672aa951cf9e61ca98dc14cad3d3565f7d9803a6b187 vnstat-2.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index 665c0feaf3..b8666c05a5 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -VNSTAT_VERSION = 2.11 +VNSTAT_VERSION = 2.13 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 06237b65d4..49ded707b8 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,6 +1,6 @@ -# From https://snapshot.debian.org/archive/debian/20241116T203634Z/pool/main/w/whois/whois_5.5.23.dsc -sha1 18227c0efec651c31fe764cdc3af17f5389bcc21 whois_5.5.23.tar.xz -sha256 35c04e46bd8435f46e446a817728b5fae2f0a389033a9383e5e20bb6e8fba14a whois_5.5.23.tar.xz +# From https://snapshot.debian.org/archive/debian/20250607T082433Z/pool/main/w/whois/whois_5.6.2.dsc +sha1 6095840107fcaf5339a7c9840c153ad3f29a7ffc whois_5.6.2.tar.xz +sha256 7fbcbc00b7aa321ac1af28a85d86d3ce7b11db1d4a2317b25407be04e506ead0 whois_5.6.2.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index ca76b22e6d..9451aa195d 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.23 -WHOIS_SITE = https://snapshot.debian.org/archive/debian/20241116T203634Z/pool/main/w/whois +WHOIS_VERSION = 5.6.2 +WHOIS_SITE = https://snapshot.debian.org/archive/debian/20250607T082433Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/wine/wine.mk b/package/wine/wine.mk index efee63a294..380f729585 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -33,7 +33,8 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vulkan + --without-vulkan \ + --without-osmesa # BR2_PACKAGE_MESA3D_OSMESA_GALLIUM removed in mesa 25.1 # Wine uses a wrapper around gcc, and uses the value of --host to # construct the filename of the gcc to call. But for external @@ -143,13 +144,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -WINE_CONF_OPTS += --with-osmesa -WINE_DEPENDENCIES += mesa3d -else -WINE_CONF_OPTS += --without-osmesa -endif - ifeq ($(BR2_PACKAGE_PCSC_LITE),y) WINE_CONF_OPTS += --with-pcsclite WINE_DEPENDENCIES += pcsc-lite diff --git a/package/wireguard-tools/wireguard-tools.hash b/package/wireguard-tools/wireguard-tools.hash index b3eadec29a..d959d964d4 100644 --- a/package/wireguard-tools/wireguard-tools.hash +++ b/package/wireguard-tools/wireguard-tools.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2021-September/007049.html -sha256 97ff31489217bb265b7ae850d3d0f335ab07d2652ba1feec88b734bc96bd05ac wireguard-tools-1.0.20210914.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2025-May/008789.html +sha256 b6f2628b85b1b23cc06517ec9c74f82d52c4cdbd020f3dd2f00c972a1782950e wireguard-tools-1.0.20250521.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-tools/wireguard-tools.mk b/package/wireguard-tools/wireguard-tools.mk index d76e836a45..958d7a3ef0 100644 --- a/package/wireguard-tools/wireguard-tools.mk +++ b/package/wireguard-tools/wireguard-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_TOOLS_VERSION = 1.0.20210914 +WIREGUARD_TOOLS_VERSION = 1.0.20250521 WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz WIREGUARD_TOOLS_LICENSE = GPL-2.0 diff --git a/package/xilinx-fpgautil/xilinx-fpgautil.hash b/package/xilinx-fpgautil/xilinx-fpgautil.hash index 1329b9ad70..d214fd4269 100644 --- a/package/xilinx-fpgautil/xilinx-fpgautil.hash +++ b/package/xilinx-fpgautil/xilinx-fpgautil.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 439a3681d8efa9641ab39c7645836b9ac78b2fdb36242f9bc94c1f3dfb2d9c4e xilinx-fpgautil-xlnx-rel-v2024.2_update3.tar.gz +sha256 a0185fda33a538379eb5ae48253f721037485be85c51555e2ad49e322d389429 xilinx-fpgautil-xlnx-rel-v2025.1.tar.gz sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e COPYING.MIT diff --git a/package/xilinx-fpgautil/xilinx-fpgautil.mk b/package/xilinx-fpgautil/xilinx-fpgautil.mk index 6f42b4799f..d41af96ee5 100644 --- a/package/xilinx-fpgautil/xilinx-fpgautil.mk +++ b/package/xilinx-fpgautil/xilinx-fpgautil.mk @@ -4,7 +4,7 @@ # ################################################################################ -XILINX_FPGAUTIL_VERSION = xlnx-rel-v2024.2_update3 +XILINX_FPGAUTIL_VERSION = xlnx-rel-v2025.1 XILINX_FPGAUTIL_SITE = $(call github,Xilinx,meta-xilinx,$(XILINX_FPGAUTIL_VERSION)) XILINX_FPGAUTIL_LICENSE = MIT XILINX_FPGAUTIL_LICENSE_FILES = COPYING.MIT diff --git a/support/testing/tests/package/sample_python_sdbus_modemmanager.py b/support/testing/tests/package/sample_python_sdbus_modemmanager.py new file mode 100644 index 0000000000..f238a4dab9 --- /dev/null +++ b/support/testing/tests/package/sample_python_sdbus_modemmanager.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 + +import sdbus + +from sdbus_block.modemmanager import MM + +sdbus.set_default_bus(sdbus.sd_bus_open_system()) +mm = MM() + +assert mm.version is not None diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py index f36faa059a..a9794a49fa 100644 --- a/support/testing/tests/package/test_clang.py +++ b/support/testing/tests/package/test_clang.py @@ -7,8 +7,10 @@ FUZZ_TIMEOUT = 120 class TestClangCompilerRT(infra.basetest.BRTest): br2_external = [infra.filepath("tests/package/br2-external/clang-compiler-rt")] + # Without this option the test fails due to insufficient address space for 64-bit allocator + va48_fragment = infra.filepath("tests/package/test_clang/linux-arm64-va48.fragment") config = \ - """ + f""" BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -17,6 +19,7 @@ class TestClangCompilerRT(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.283" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{va48_fragment}" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_COMPILER_RT=y BR2_PACKAGE_LLVM=y diff --git a/support/testing/tests/package/test_clang/linux-arm64-va48.fragment b/support/testing/tests/package/test_clang/linux-arm64-va48.fragment new file mode 100644 index 0000000000..1bafe6e581 --- /dev/null +++ b/support/testing/tests/package/test_clang/linux-arm64-va48.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_VA_BITS_48=y diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index 2c44e25cec..59b3fe7d3e 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -17,6 +17,40 @@ class TestGpsd(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set """ + def _test_gpsd_one(self, transport=None): + # Start the "gpsfake" GPS emulator. + cmd = "gpsfake" + cmd += " --slow --cycle 0.1 --quiet" + if transport: + cmd += f" --{transport}" + cmd += " /root/nmea.log &> /dev/null &" + self.assertRunOk(cmd) + + # Wait a bit, to let the gpsfake and gpsd to settle... + time.sleep(3 * self.timeout_multiplier) + + # List the GPS devices. We should see our local UDP test GPS. + out, ret = self.emulator.run("gpsctl") + self.assertEqual(ret, 0) + self.assertIn("NMEA0183", out[0]) + if transport: + self.assertTrue(out[0].startswith(f"{transport}://127.0.0.1")) + else: + self.assertTrue(out[0].startswith("/dev/pts/1 ")) + + # Collect some of our fake GPS data, and check we got the + # coordinates from our test data file. + # Our expected coordinates are: + # https://www.openstreetmap.org/#map=19/43.60439/1.44336 + out, ret = self.emulator.run("gpscsv --header 0 --count 3") + self.assertEqual(ret, 0) + _, gps_lat, gps_long, _ = out[0].split(",") + self.assertAlmostEqual(float(gps_lat), 43.60439) + self.assertAlmostEqual(float(gps_long), 1.44336) + + # Terminate gpsd, wait for it to finish. + self.assertRunOk("kill %1; sleep 1") + def test_run(self): cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv5", @@ -30,27 +64,7 @@ class TestGpsd(infra.basetest.BRTest): # Since gpsd needs a real GPS device, we stop the service. self.assertRunOk("/etc/init.d/S50gpsd stop") - # We start the "gpsfake" GPS emulator instead. - cmd = "gpsfake" - cmd += " --slow --cycle 0.1 --quiet" - cmd += " /root/udp-nmea.log &> /dev/null &" - self.assertRunOk(cmd) - - # Wait a bit, to let the gpsfake and gpsd to settle... - time.sleep(3 * self.timeout_multiplier) - - # List the GPS devices. We should see our local UDP test GPS. - out, ret = self.emulator.run("gpsctl") - self.assertEqual(ret, 0) - self.assertTrue(out[0].startswith("udp://127.0.0.1")) - self.assertIn("NMEA0183", out[0]) - - # Collect some of our fake GPS data, and check we got the - # coordinates from our test data file. - # Our expected coordinates are: - # https://www.openstreetmap.org/#map=19/43.60439/1.44336 - out, ret = self.emulator.run("gpscsv --header 0 --count 3") - self.assertEqual(ret, 0) - _, gps_lat, gps_long, _ = out[0].split(",") - self.assertAlmostEqual(float(gps_lat), 43.60439) - self.assertAlmostEqual(float(gps_long), 1.44336) + # Test various transports for gpsd + self._test_gpsd_one() + self._test_gpsd_one("tcp") + self._test_gpsd_one("udp") diff --git a/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/nmea.log similarity index 92% rename from support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log rename to support/testing/tests/package/test_gpsd/rootfs-overlay/root/nmea.log index f3730da7c5..da9fbf8b78 100644 --- a/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log +++ b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/nmea.log @@ -1,5 +1,4 @@ # Name: NMEA 0183 messages for gpsd Buildroot test -# Transport: UDP # For packet format, see: # https://gpsd.gitlab.io/gpsd/NMEA.html $GPGGA,123456.789,4336.2634,N,0126.6016,E,1,04,1.7,143.5,M,,,,*3A diff --git a/support/testing/tests/package/test_mesa3d.py b/support/testing/tests/package/test_mesa3d.py new file mode 100644 index 0000000000..f5133c2eef --- /dev/null +++ b/support/testing/tests/package/test_mesa3d.py @@ -0,0 +1,53 @@ +import os +import infra.basetest + +RUSTICL_TIMEOUT = 180 + + +class TestMesa3DRusticl(infra.basetest.BRTest): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MESA3D=y + BR2_PACKAGE_MESA3D_LLVM=y + BR2_PACKAGE_MESA3D_OPENCL=y + BR2_PACKAGE_MESA3D_RUSTICL=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE=y + BR2_PACKAGE_CLINFO=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="1024M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext2") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot( + arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=[ + "-M", "virt", + "-cpu", "cortex-a57", + "-m", "512", + "-drive", f"file={img},if=virtio,format=raw" + ] + ) + self.emulator.login() + + def test_run(self): + self.login() + + # check the output exit code + output, exit_code = self.emulator.run("RUSTICL_ENABLE=llvmpipe clinfo", RUSTICL_TIMEOUT) + self.assertEqual(exit_code, 0) + # also check if platform name is rusticl and device name is llvmpipe + self.assertRegex("\n".join(output), r"Platform Name\s+rusticl") + self.assertRegex("\n".join(output), r"Device Name\s+llvmpipe") diff --git a/support/testing/tests/package/test_python_sdbus_modemmanager.py b/support/testing/tests/package/test_python_sdbus_modemmanager.py new file mode 100644 index 0000000000..34ab66e3bf --- /dev/null +++ b/support/testing/tests/package/test_python_sdbus_modemmanager.py @@ -0,0 +1,15 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3SdbusNetworkmanager(TestPythonPackageBase): + __test__ = True + config = ( + TestPythonPackageBase.config + + """ + BR2_PACKAGE_PYTHON3=y + BR2_INIT_SYSTEMD=y + BR2_PACKAGE_MODEM_MANAGER=y + BR2_PACKAGE_PYTHON_SDBUS_MODEMMANAGER=y + """ + ) + sample_scripts = ["tests/package/sample_python_sdbus_modemmanager.py"] diff --git a/toolchain/Config.in b/toolchain/Config.in index 89eaa7b618..3063bae2b6 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -811,10 +811,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_14 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_13 +config BR2_TOOLCHAIN_GCC_AT_LEAST_15 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "15" if BR2_TOOLCHAIN_GCC_AT_LEAST_15 default "14" if BR2_TOOLCHAIN_GCC_AT_LEAST_14 default "13" if BR2_TOOLCHAIN_GCC_AT_LEAST_13 default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index c86c5d725c..19c97410c6 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -10,7 +10,7 @@ config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH For example, to build both a Microblaze and a RISC-V bare metal toolchain, use the following definition: - "microblazeel-xilinx-elf riscv32-buldroot-elf" + "microblazeel-buildroot-elf riscv32-buildroot-elf" source "package/newlib-bare-metal/Config.in" diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index e644c1e7bb..9970cad5e1 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -62,6 +62,9 @@ static char *predef_args[] = { #endif path, "--sysroot", sysroot, +#ifdef BR_CLANG_CONFIG_FILE + BR_CLANG_CONFIG_FILE, +#endif #ifdef BR_ABI "-mabi=" BR_ABI, #endif