From 05c36d5d875713521f99b7bad48be316dcde2510 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 23 Feb 2026 17:23:37 -0800 Subject: [PATCH] package/llama-cpp: bump to version b8117 Release notes: https://github.com/ggml-org/llama.cpp/releases Merge BR2_PACKAGE_LLAMA_CPP_SERVER into BR2_PACKAGE_LLAMA_CPP_TOOLS, as both of these options must be enabled to build tools like llama-cli and llama-server. See upstream commit [1]. Since the Buildroot option BR2_PACKAGE_LLAMA_CPP_SERVER is removed, this commit also removes it from support/testing/tests/package/test_aichat.py which was using it. [1] https://github.com/ggml-org/llama.cpp/commit/a180ba78c710f52af7c7edee562fbe98c36d6ddd Signed-off-by: Joseph Kogut [Julien: - reindent options in .mk - remove BR2_PACKAGE_LLAMA_CPP_SERVER in test_aichat.py ] Signed-off-by: Julien Olivain --- Config.in.legacy | 9 +++++++++ package/llama-cpp/Config.in | 8 ++------ package/llama-cpp/llama-cpp.hash | 4 ++-- package/llama-cpp/llama-cpp.mk | 16 +++++++--------- support/testing/tests/package/test_aichat.py | 1 - 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b85a147032..518251c816 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/package/llama-cpp/Config.in b/package/llama-cpp/Config.in index c3eaa2a4ea..fa7da609de 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 765025f180..3967bc2fbc 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 5112022656..a368d9d6b7 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 +LLAMA_CPP_CONF_OPTS += \ + -DLLAMA_BUILD_SERVER=ON \ + -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 -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/support/testing/tests/package/test_aichat.py b/support/testing/tests/package/test_aichat.py index 7c978315c9..5fc554bbb5 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}"