diff --git a/DEVELOPERS b/DEVELOPERS index 6f5008ab892..0c51a1db035 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -612,6 +612,7 @@ F: package/qoriq-cadence-dp-firmware/ N: Chen Pei F: package/iniparser/ +F: package/ndctl/ N: Chris Packham F: package/coremark/ diff --git a/package/Config.in b/package/Config.in index d7791bdd3d4..b98a89abdb6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2838,6 +2838,7 @@ menu "System tools" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" + source "package/ndctl/Config.in" source "package/nerdctl/Config.in" source "package/netifrc/Config.in" source "package/numactl/Config.in" diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index e9683f19b0b..8642387392f 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,4 +1,4 @@ -# From https://github.com/harfbuzz/harfbuzz/releases/tag/13.1.1 -sha256 e7f3b8bac3fdcc529985be8e84fbd65c675ac47ee58512b15a5dd620c79ffe2a harfbuzz-13.1.1.tar.xz +# From https://github.com/harfbuzz/harfbuzz/releases/tag/13.2.1 +sha256 6695da3eb7e1be0aa3092fe4d81433a33b47f4519259c759d729e3a9a55c1429 harfbuzz-13.2.1.tar.xz # Locally computed sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 6cedcc0fd83..df05596b1d5 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 13.1.1 +HARFBUZZ_VERSION = 13.2.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) diff --git a/package/ndctl/Config.in b/package/ndctl/Config.in new file mode 100644 index 00000000000..9f7f5f1c9bc --- /dev/null +++ b/package/ndctl/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_NDCTL + bool "ndctl" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 # __struct_group() + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + select BR2_PACKAGE_INIPARSER + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_KEYUTILS + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + A "device memory" enabling project encompassing tools and + libraries for CXL, NVDIMMs, DAX, memory tiering and other + platform memory device topics. + + https://github.com/pmem/ndctl + +comment "ndctl needs udev /dev management, a toolchain headers >= 5.10" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_UDEV \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 diff --git a/package/ndctl/ndctl.hash b/package/ndctl/ndctl.hash new file mode 100644 index 00000000000..f731fb7263e --- /dev/null +++ b/package/ndctl/ndctl.hash @@ -0,0 +1,7 @@ +# locally computed +sha256 dd4b9b9a9dc0a15e980670b6f889e910a80ad60f2309e03bfd9cc6071d14dd30 ndctl-83.tar.gz +sha256 1334f22048052d69647860fe9fb24997dc3b33737cb494297d68949f589fa1cf COPYING +sha256 5c37e41135091a39821cfb306ad8516625b0bb49510ce56ad85c347bbc46df29 LICENSES/other/CC0-1.0 +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/other/MIT +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSES/preferred/GPL-2.0 +sha256 9397d01be0ec93d29384447ba18e532ab7b01af8c8b582ece9f10ad45b9568db LICENSES/preferred/LGPL-2.1 diff --git a/package/ndctl/ndctl.mk b/package/ndctl/ndctl.mk new file mode 100644 index 00000000000..ceb01d633fb --- /dev/null +++ b/package/ndctl/ndctl.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# ndctl +# +################################################################################ + +NDCTL_VERSION = 83 +NDCTL_SITE = $(call github,pmem,ndctl,v$(NDCTL_VERSION)) +NDCTL_LICENSE = \ + CC0-1.0 (helper routines), \ + GPL-2.0+ (tools), \ + LGPL-2.1+ (libraries), \ + MIT (helper routines) +NDCTL_LICENSE_FILES = \ + COPYING \ + LICENSES/other/CC0-1.0 \ + LICENSES/other/MIT \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/preferred/LGPL-2.1 + +NDCTL_DEPENDENCIES = \ + iniparser \ + json-c \ + keyutils \ + kmod \ + udev \ + util-linux-libs + +# Currently, disabling keyutils or fwctl support will cause builds to +# fail. Therefore, always pass the -Dfwctl=enabled and -Dkeyutils=enabled. +NDCTL_CONF_OPTS = \ + -Ddocs=disabled \ + -Dfwctl=enabled \ + -Dkeyutils=enabled \ + -Diniparserdir=$(STAGING_DIR)/usr/include/iniparser + +ifeq ($(BR2_PACKAGE_LIBTRACEFS)$(BR2_PACKAGE_LIBTRACEEVENT),yy) +NDCTL_CONF_OPTS += -Dlibtracefs=enabled +NDCTL_DEPENDENCIES += libtraceevent libtracefs +else +NDCTL_CONF_OPTS += -Dlibtracefs=disabled +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +NDCTL_CONF_OPTS += -Dsystemd=enabled +NDCTL_DEPENDENCIES += systemd +else +NDCTL_CONF_OPTS += -Dsystemd=disabled +endif + +$(eval $(meson-package)) diff --git a/support/testing/tests/package/test_aichat.py b/support/testing/tests/package/test_aichat.py index 5fc554bbb5d..50c07f87dc1 100644 --- a/support/testing/tests/package/test_aichat.py +++ b/support/testing/tests/package/test_aichat.py @@ -70,6 +70,8 @@ def test_run(self): llama_opts = "--log-file /tmp/llama-server.log" # We set a fixed seed, to reduce variability of the test llama_opts += " --seed 123456789" + # We disable prompt caching to reduce RAM usage + llama_opts += " --cache-ram 0" llama_opts += f" --hf-repo {hf_model}" # We start a llama-server in background, which will expose an @@ -91,9 +93,12 @@ def test_run(self): if ret == 0: models_json = "".join(out) models = json.loads(models_json) - model_name = models['models'][0]['name'] - if model_name == hf_model: - break + try: + model_name = models['models'][0]['name'] + if model_name == hf_model: + break + except KeyError: + pass else: self.fail("Timeout while waiting for llama-server.")