diff --git a/Config.in.legacy b/Config.in.legacy index b85a14703277..518251c8169d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2026.05" +config BR2_PACKAGE_LLAMA_CPP_SERVER + bool "llama-cpp option removed" + select BR2_PACKAGE_LLAMA_CPP_TOOLS + select BR2_LEGACY + help + Several tools (server, cli) now require building both + tools and server, so enable both with the same config + BR2_PACKAGE_LLAMA_CPP_TOOLS + config BR2_PACKAGE_PYTHON3_OSSAUDIODEV bool "python3 ossaudiodev module removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index b722b5fd5102..6f5008ab892b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2103,6 +2103,7 @@ F: board/octavo/osd32mp1-brk/ F: board/octavo/osd32mp1-red/ F: configs/octavo_osd32mp1_brk_defconfig F: configs/octavo_osd32mp1_red_defconfig +F: package/drm-info/ N: Kris Bahnsen F: package/wilc-firmware/ @@ -2210,6 +2211,29 @@ F: package/ffmpeg/ F: package/mpv/ F: package/rpi-firmware/ +N: Manuel Diener +F: package/pico-sdk/ +F: package/picotool/ +F: package/python-annotated-doc/ +F: package/python-apscheduler/ +F: package/python-crc/ +F: package/python-diskcache/ +F: package/python-django/ +F: package/python-gpiod/ +F: package/python-immutabledict/ +F: package/python-jc/ +F: package/python-log-rate-limit/ +F: package/python-pydantic/ +F: package/python-pydantic-core/ +F: package/python-pydantic-settings/ +F: package/python-typing-inspection/ +F: package/python-tzlocal/ +F: package/python-sdbus-modemmanager/ +F: package/python-sdbus-systemd/ +F: package/python-varlink/ +F: package/python-waitress/ +F: package/python-whitenoise/ + N: Marcin Bis F: package/bluez5_utils/ F: package/cc-tool/ diff --git a/package/Config.in b/package/Config.in index 49ff5e957c5b..d7791bdd3d4b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -306,6 +306,7 @@ menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" + source "package/drm-info/Config.in" source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" diff --git a/package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch b/package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch new file mode 100644 index 000000000000..1de9a9122315 --- /dev/null +++ b/package/bootgen/0002-flexlexer-use-embedded-win_include-flexlexer.h.patch @@ -0,0 +1,76 @@ +From dfe45e10791a171c3c79699257d3d3a978ec30eb Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 18 Mar 2026 09:51:58 +0000 +Subject: [PATCH] flexlexer: use embedded win_include/flexlexer.h + +bootgen embeds an old version of flex. If the host machine has a newer version +of flex, the bootgen binary that is built will have errors such as the +following, if the wrong version of flexlexer.h is used. + +$ output/host/bin/bootgen + +****** Bootgen v2025.1-Merged + **** Build date : Mar 18 2026-07:08:01 + ** Copyright 1986-2022 Xilinx, Inc. All Rights Reserved. + ** Copyright 2022-2025 Advanced Micro Devices, Inc. All Rights Reserved. + +ERROR: syntax error +-h + +Running the bootgen binary should print the help menu by default and should +not have a syntax error. + +Correct the path to the flexlexer.h header files, such that no host version +of these files can cause a silent build failure. + +Upstream: CR to AMD jira + +Signed-off-by: Neal Frager +--- + common/include/bifscanner.h | 2 +- + common/include/cmdoptionsscanner.h | 2 +- + common/include/reginitscanner.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common/include/bifscanner.h b/common/include/bifscanner.h +index 9683416..9aa72a5 100755 +--- a/common/include/bifscanner.h ++++ b/common/include/bifscanner.h +@@ -29,7 +29,7 @@ + #if ! defined(yyFlexLexerOnce) + #undef yyFlexLexer + #define yyFlexLexer bifFlexLexer +-#include "FlexLexer.h" ++#include "../../win_include/FlexLexer.h" + #endif + + // Override the interface for yylex since we namespaced it +diff --git a/common/include/cmdoptionsscanner.h b/common/include/cmdoptionsscanner.h +index aa2f474..78fa7cf 100755 +--- a/common/include/cmdoptionsscanner.h ++++ b/common/include/cmdoptionsscanner.h +@@ -30,7 +30,7 @@ + + #undef yyFlexLexer + #define yyFlexLexer reginitFlexLexer +-#include "FlexLexer.h" ++#include "../../win_include/FlexLexer.h" + #endif + + // Override the interface for yylex since we namespaced it +diff --git a/common/include/reginitscanner.h b/common/include/reginitscanner.h +index 74463e6..d8152a6 100755 +--- a/common/include/reginitscanner.h ++++ b/common/include/reginitscanner.h +@@ -30,7 +30,7 @@ + + #undef yyFlexLexer + #define yyFlexLexer reginitFlexLexer +-#include "FlexLexer.h" ++#include "../../win_include/FlexLexer.h" + #endif + + // Override the interface for yylex since we namespaced it +-- +2.25.1 + diff --git a/package/daq3/daq3.hash b/package/daq3/daq3.hash index 4a24f98173b6..524c0eb868b6 100644 --- a/package/daq3/daq3.hash +++ b/package/daq3/daq3.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 c0e8535533720a6df05ab884b7c8f5fb4222f3aac12bdc11829e08c79716d338 daq3-3.0.9.tar.gz +sha256 651e38a2737d179a224bcb01d8a06300667708ee614d19a8b411fdd212cc035d daq3-3.0.25.tar.gz # Hash for license files: sha256 64601289158eddad72cb4de72652f9e64dc886942c910b38ddee93ba13b0db26 COPYING diff --git a/package/daq3/daq3.mk b/package/daq3/daq3.mk index bab957e0524b..ec3f4ba67048 100644 --- a/package/daq3/daq3.mk +++ b/package/daq3/daq3.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAQ3_VERSION = 3.0.9 +DAQ3_VERSION = 3.0.25 DAQ3_SITE = $(call github,snort3,libdaq,v$(DAQ3_VERSION)) DAQ3_LICENSE = GPL-2.0 DAQ3_LICENSE_FILES = COPYING LICENSE diff --git a/package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch b/package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch new file mode 100644 index 000000000000..3e70f3d1cf25 --- /dev/null +++ b/package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch @@ -0,0 +1,47 @@ +From c94d00730d0c25a4a4c46abfcf27823919ac9854 Mon Sep 17 00:00:00 2001 +From: Kory Maincent +Date: Mon, 16 Mar 2026 18:50:09 +0100 +Subject: [PATCH] Revert "Find drm_fourcc.h in sysroot" + +This reverts commit cde94140f08775dc4df7eaac766556218d9e1321 + +When cross-compiling, pkg-config's includedir variable already returns +an absolute path that includes the sysroot prefix (e.g. +/sysroot/usr/include). Prepending pc_sysrootdir to it duplicates the +prefix and produces a broken path. + +The reverted commit introduced the double-prefix issue. Drop pc_sysrootdir +and use includedir directly, which already carries the correct absolute +path. + +The workaround was only needed for the legacy pkg-config 0.29 (2017) +project, which did not apply PKG_CONFIG_SYSROOT_DIR to includedir. +The actively maintained pkgconf project handles this correctly, and +the legacy tool is no longer in widespread use. + +You can verify the behavior with: + $ PKG_CONFIG_SYSROOT_DIR="/bla" pkg-config --variable=includedir libdrm + /bla/usr/include + +Upstream: https://gitlab.freedesktop.org/emersion/drm_info/-/merge_requests/114 +Signed-off-by: Kory Maincent +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1f80024..e4ce03e 100644 +--- a/meson.build ++++ b/meson.build +@@ -68,7 +68,7 @@ if libdrm.version().version_compare('<2.4.130') + elif libdrm.type_name() == 'internal' + fourcc_h = meson.current_source_dir() / 'subprojects/libdrm/include/drm/drm_fourcc.h' + else +- fourcc_h = libdrm.get_variable(pkgconfig: 'pc_sysrootdir') + libdrm.get_variable(pkgconfig: 'includedir') / 'libdrm/drm_fourcc.h' ++ fourcc_h = libdrm.get_variable(pkgconfig: 'includedir') / 'libdrm/drm_fourcc.h' + endif + + # The DRM_BUS_FAUX bus and its information is included in libdrm v2.4.127 +-- +2.43.0 + diff --git a/package/drm-info/Config.in b/package/drm-info/Config.in new file mode 100644 index 000000000000..49b8fd6f2cbe --- /dev/null +++ b/package/drm-info/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_DRM_INFO + bool "drm_info" + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBDRM + help + Small utility to dump info about DRM devices. + + https://gitlab.freedesktop.org/emersion/drm_info + +comment "drm_info needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/drm-info/drm-info.hash b/package/drm-info/drm-info.hash new file mode 100644 index 000000000000..de852cb5eb24 --- /dev/null +++ b/package/drm-info/drm-info.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 53ef974ac657a0b4b9d7424a65b7f92e6ca26c15e8356f4146ae8bb9cae2db44 drm_info-2.9.0.tar.gz +sha256 05a54b690d8851143a8b923cfe8ac48f49050f9d2166e7eb0c1d340242d7f46a LICENSE diff --git a/package/drm-info/drm-info.mk b/package/drm-info/drm-info.mk new file mode 100644 index 000000000000..25deb18f00f1 --- /dev/null +++ b/package/drm-info/drm-info.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# drm-info +# +################################################################################ + +DRM_INFO_VERSION = 2.9.0 +DRM_INFO_SITE = https://gitlab.freedesktop.org/emersion/drm_info/-/releases/v$(DRM_INFO_VERSION)/downloads +DRM_INFO_SOURCE = drm_info-$(DRM_INFO_VERSION).tar.gz +DRM_INFO_LICENSE = MIT +DRM_INFO_LICENSE_FILES = LICENSE +DRM_INFO_DEPENDENCIES = \ + json-c \ + libdrm + +$(eval $(meson-package)) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 7536e7cb1d0b..37a9c2ab9f89 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,4 +1,4 @@ -# From https://github.com/libexpat/libexpat/releases/tag/R_2_7_4 -sha256 9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0 expat-2.7.4.tar.xz +# From https://github.com/libexpat/libexpat/releases/tag/R_2_7_5 +sha256 1032dfef4ff17f70464827daa28369b20f6584d108bc36f17ab1676e1edd2f91 expat-2.7.5.tar.xz # Locally calculated sha256 31b15de82aa19a845156169a17a5488bf597e561b2c318d159ed583139b25e87 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 215c34e9cfaa..68af75123307 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.7.4 +EXPAT_VERSION = 2.7.5 EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES diff --git a/package/frr/frr.hash b/package/frr/frr.hash index e89b5042a949..349c56fc2425 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fcdd1d326b2ebd1cc4b607fe1681d476865371ac0028fc5595a75c00f370189e frr-10.5.1.tar.gz +sha256 ecc95009b88e66df2c91be02fbf0a3eb8e1de434fd652e0cbf46f19126f708ec frr-10.5.3.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 04282442fb97..61a34de4d36b 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 10.5.1 +FRR_VERSION = 10.5.3 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0+ FRR_LICENSE_FILES = \ diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 02dc550dbe89..0ddc8ced77bf 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e7fdcb7ccc83a3be6181f7d7d71f0ea027a000e0eefe9bba3b8373c05eb5764a janet-1.40.1.tar.gz +sha256 168e97e1b790f6e9d1e43685019efecc4ee473d6b9f8c421b49c195336c0b725 janet-1.41.2.tar.gz # Locally calculated -sha256 805858acec1df54018879efc78ee3ff7bab5e69908c58e46bbc2d94520f29023 LICENSE +sha256 16e31703a3ab5c4d3e35aa8bd607551911a9d981fbf0b5fbd832fe6eed4b70ca LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index dd2283e5a915..bca7ff0500a2 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.40.1 +JANET_VERSION = 1.41.2 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index 484e12324c1a..e4930b9fb560 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e1fab309232e7115efa0868c8c3c13c2e7639628ef8bc59a93bf4aa82a3b20d kodi-pvr-zattoo-21.0.4-Omega.tar.gz +sha256 b9bf700f0ee93f0d6b87952e9420e277c384cf0d3b07dc2849f5496304104af9 kodi-pvr-zattoo-21.0.5-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 6a981e12b709..8171939c604d 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 21.0.4-Omega +KODI_PVR_ZATTOO_VERSION = 21.0.5-Omega KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md diff --git a/package/llama-cpp/Config.in b/package/llama-cpp/Config.in index c3eaa2a4ea3f..fa7da609deac 100644 --- a/package/llama-cpp/Config.in +++ b/package/llama-cpp/Config.in @@ -25,12 +25,8 @@ if BR2_PACKAGE_LLAMA_CPP config BR2_PACKAGE_LLAMA_CPP_TOOLS bool "Enable tools" help - Build CLI tools like llama-cli, llama-bench, etc. - -config BR2_PACKAGE_LLAMA_CPP_SERVER - bool "Enable server" - help - Build OpenAI API-compatible web server, llama-server. + Build CLI tools like llama-cli, llama-server, llama-bench, + etc. config BR2_PACKAGE_LLAMA_CPP_VULKAN bool "Vulkan support" diff --git a/package/llama-cpp/llama-cpp.hash b/package/llama-cpp/llama-cpp.hash index 765025f18085..3967bc2fbc48 100644 --- a/package/llama-cpp/llama-cpp.hash +++ b/package/llama-cpp/llama-cpp.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b2c4c89b6282c4ddc7c9c00c79af77d84811b6092aa47838a194e8a2981fa104 b7271.tar.gz +sha256 4f9fdf018339783722936d537573d40cca596262e42714f597b1c93299113cea b8117.tar.gz # License -sha256 e562a2ddfaf8280537795ac5ecd34e3012b6582a147ef69ba6a6a5c08c84757d LICENSE +sha256 94f29bbed6a22c35b992c5c6ebf0e7c92f13b836b90f36f461c9cf2f0f1d010d LICENSE diff --git a/package/llama-cpp/llama-cpp.mk b/package/llama-cpp/llama-cpp.mk index 5112022656f4..a368d9d6b714 100644 --- a/package/llama-cpp/llama-cpp.mk +++ b/package/llama-cpp/llama-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLAMA_CPP_VERSION = b7271 +LLAMA_CPP_VERSION = b8117 LLAMA_CPP_SOURCE = $(LLAMA_CPP_VERSION).tar.gz LLAMA_CPP_SITE = https://github.com/ggml-org/llama.cpp/archive/refs/tags LLAMA_CPP_LICENSE = MIT @@ -42,15 +42,13 @@ LLAMA_CPP_CONF_OPTS += -DLLAMA_CURL=OFF endif ifeq ($(BR2_PACKAGE_LLAMA_CPP_TOOLS),y) -LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_TOOLS=ON -else -LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_TOOLS=OFF -endif - -ifeq ($(BR2_PACKAGE_LLAMA_CPP_SERVER),y) -LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_SERVER=ON +LLAMA_CPP_CONF_OPTS += \ + -DLLAMA_BUILD_SERVER=ON \ + -DLLAMA_BUILD_TOOLS=ON else -LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_SERVER=OFF +LLAMA_CPP_CONF_OPTS += \ + -DLLAMA_BUILD_SERVER=OFF \ + -DLLAMA_BUILD_TOOLS=OFF endif ifeq ($(BR2_PACKAGE_LLAMA_CPP_VULKAN),y) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 34555c05ea4f..cabdd479a18e 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 = 26.0.2 +MESA3D_HEADERS_VERSION = 26.0.3 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/mesa3d.hash b/package/mesa3d/mesa3d.hash index 7cdaee7e7950..c938372b49a5 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2026-March/000841.html -sha256 973f535221be211c6363842b4cce9ef8e9b3e1d5ea86c5450ca86060163c7346 mesa-26.0.2.tar.xz -sha512 0a7b9fc9b09e40345cc22d246dc1656900d74754c093882f6a39623af17fddc5f4a0c7938207c784ccf7306c5ed497be6a02c36f95c6548e01a2faa085e04c35 mesa-26.0.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2026-March/000842.html +sha256 ddb7443d328e89aa45b4b6b80f077bf937f099daeca8ba48cabe32aab769e134 mesa-26.0.3.tar.xz +sha512 82a33d0fa0c2855a63f599e38753126a2195025a13e45f38e14fda7aa008cb05925bb74088e4a1e199c9237d9388f4d4408a2c95c1d7fe79d8e6e6f27c84187b mesa-26.0.3.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 3e5ce1266e84..b9243dfaecea 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 = 26.0.2 +MESA3D_VERSION = 26.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos diff --git a/package/snort3/0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch b/package/snort3/0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch deleted file mode 100644 index 4f24ee72d4eb..000000000000 --- a/package/snort3/0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 154cf0312b3652bdfdf241e6883d7c6de9b85e01 Mon Sep 17 00:00:00 2001 -From: "Maya Dagon (mdagon)" -Date: Mon, 24 Jul 2023 08:06:50 +0000 -Subject: [PATCH] Pull request #3925: build: fix cstdint related clearlinux - errors - -Merge in SNORT/snort3 from ~MDAGON/snort3:clearlinux to master - -Squashed commit of the following: - -commit 7ef2bc13851ffa2bf7908964242859a8c05ddd96 -Author: maya dagon -Date: Thu Jul 20 14:34:01 2023 -0400 - - build: fix cstdint related clearlinux errors - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/snort3/snort3/commit/154cf0312b3652bdfdf241e6883d7c6de9b85e01 ---- - src/js_norm/js_identifier_ctx.h | 1 + - src/packet_io/sfdaq_config.h | 1 + - src/service_inspectors/wizard/magic.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/utils/js_identifier_ctx.h b/src/utils/js_identifier_ctx.h -index b8d5121a2c..6ef1ce2b23 100644 ---- a/src/utils/js_identifier_ctx.h -+++ b/src/utils/js_identifier_ctx.h -@@ -20,6 +20,7 @@ - #ifndef JS_IDENTIFIER_CTX - #define JS_IDENTIFIER_CTX - -+#include - #include - #include - #include -diff --git a/src/packet_io/sfdaq_config.h b/src/packet_io/sfdaq_config.h -index 990c45785b..f4c1042bc3 100644 ---- a/src/packet_io/sfdaq_config.h -+++ b/src/packet_io/sfdaq_config.h -@@ -21,6 +21,7 @@ - #ifndef SFDAQ_CONFIG_H - #define SFDAQ_CONFIG_H - -+#include - #include - #include - -diff --git a/src/service_inspectors/wizard/magic.h b/src/service_inspectors/wizard/magic.h -index fa24d0b5a4..b9477eb95c 100644 ---- a/src/service_inspectors/wizard/magic.h -+++ b/src/service_inspectors/wizard/magic.h -@@ -21,6 +21,7 @@ - #define MAGIC_H - - #include -+#include - #include - #include - diff --git a/package/snort3/Config.in b/package/snort3/Config.in index 7171603aa3a4..8dae65381eaa 100644 --- a/package/snort3/Config.in +++ b/package/snort3/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_SNORT3 select BR2_PACKAGE_LIBDNET select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LUAJIT - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_PACKAGE_LIBTIRPC_RPCDB if BR2_PACKAGE_LIBTIRPC select BR2_PACKAGE_OPENSSL diff --git a/package/snort3/snort3.hash b/package/snort3/snort3.hash index 7746547d18d9..599818ee2492 100644 --- a/package/snort3/snort3.hash +++ b/package/snort3/snort3.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d787d954f21d4cd6a048e10b8c53c78cb6287ec448108fc573b951639c8947b3 snort3-3.1.40.0.tar.gz +sha256 9465d19b0925088266504e8962e97e55359bafd6a19f66b4169dcd21ef1d8ec5 snort3-3.11.1.0.tar.gz # Hash for license files: sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING diff --git a/package/snort3/snort3.mk b/package/snort3/snort3.mk index a76b83183823..273aa567097b 100644 --- a/package/snort3/snort3.mk +++ b/package/snort3/snort3.mk @@ -4,13 +4,13 @@ # ################################################################################ -SNORT3_VERSION = 3.1.40.0 +SNORT3_VERSION = 3.11.1.0 SNORT3_SITE = $(call github,snort3,snort3,$(SNORT3_VERSION)) SNORT3_LICENSE = GPL-2.0 SNORT3_LICENSE_FILES = COPYING LICENSE SNORT3_DEPENDENCIES = \ - host-pkgconf daq3 flex hwloc libdnet libpcap luajit openssl pcre zlib + host-pkgconf daq3 flex hwloc libdnet libpcap luajit openssl pcre2 zlib SNORT3_CONF_OPTS = \ -DENABLE_GDB=OFF \ diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 7b71e2d948ca..39b894fe9ab6 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 1135fb9c03b1..fa0b6aba786c 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2025.10 +UBOOT_TOOLS_VERSION = 2026.01 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = https://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ diff --git a/package/xen/0009-Arm-platforms-fix-build-with-gcc15.patch b/package/xen/0009-Arm-platforms-fix-build-with-gcc15.patch new file mode 100644 index 000000000000..fb95ca9fa51b --- /dev/null +++ b/package/xen/0009-Arm-platforms-fix-build-with-gcc15.patch @@ -0,0 +1,46 @@ +From d12666d74dc742bb06c30b96d6b874a3e14c6b46 Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Tue, 26 Aug 2025 08:41:18 +0200 +Subject: [PATCH] Arm/platforms: fix build with gcc15 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For two of the headers gcc15 complains "header guard ... followed by +'#define' of a different macro". Misra certainly wouldn't have liked +this either, if these headers were covered by a scan. + +Signed-off-by: Jan Beulich +Acked-by: Michal Orzel +Upstream: https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=39f95089e2ba15c5438ce904c0cbbd8d79d3e6e7 +Signed-off-by: Vincent Stehlé +--- + xen/include/asm-arm/platforms/midway.h | 2 +- + xen/include/asm-arm/platforms/omap5.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xen/include/asm-arm/platforms/midway.h b/xen/include/asm-arm/platforms/midway.h +index 099e435..6914393 100644 +--- a/xen/include/asm-arm/platforms/midway.h ++++ b/xen/include/asm-arm/platforms/midway.h +@@ -1,5 +1,5 @@ + #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H +-#define __ASM_ASM_PLATFORMS_MIDWAY_H ++#define __ASM_ARM_PLATFORMS_MIDWAY_H + + /* addresses of SREG registers for resetting the SoC */ + #define MW_SREG_PWR_REQ 0xfff3cf00 +diff --git a/xen/include/asm-arm/platforms/omap5.h b/xen/include/asm-arm/platforms/omap5.h +index c559c84..8867b45 100644 +--- a/xen/include/asm-arm/platforms/omap5.h ++++ b/xen/include/asm-arm/platforms/omap5.h +@@ -1,5 +1,5 @@ + #ifndef __ASM_ARM_PLATFORMS_OMAP5_H +-#define __ASM_ASM_PLATFORMS_OMAP5_H ++#define __ASM_ARM_PLATFORMS_OMAP5_H + + #define REALTIME_COUNTER_BASE 0x48243200 + #define INCREMENTER_NUMERATOR_OFFSET 0x10 +-- +2.53.0 + diff --git a/support/testing/tests/package/test_aichat.py b/support/testing/tests/package/test_aichat.py index 7c978315c9bd..5fc554bbb5dc 100644 --- a/support/testing/tests/package/test_aichat.py +++ b/support/testing/tests/package/test_aichat.py @@ -23,7 +23,6 @@ class TestAiChat(infra.basetest.BRTest): BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LLAMA_CPP=y - BR2_PACKAGE_LLAMA_CPP_SERVER=y BR2_PACKAGE_LLAMA_CPP_TOOLS=y BR2_PACKAGE_OPENSSL=y BR2_ROOTFS_OVERLAY="{rootfs_overlay}"