From 4206464bc04ef3dde58218e515e86ab93ea2850c Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 21 Sep 2026 19:40:14 +0200 Subject: [PATCH] librespeed: fix the kconfig recursion between common and the clients Two packages provide librespeed-cli, and for a dependency written with a leading plus, package-metadata.pl re-emits the chosen provider's architecture gate under a condition that names the consuming package. Kconfig reads that as a self-dependency, once for librespeed-common and again for luci-app-librespeed. Naming the client without the plus emits a plain either-or instead, and the user picks. The provide also crosses package boundaries, where package-pack.mk asks for an unversioned one: with a version the higher one wins, so a release on either side would decide which client apk installs. Unversioned, the package called librespeed-cli keeps the name, and a default variant gives the Rust client the provider priority so it is still chosen where the Go client is not built. Signed-off-by: Josef Schlehofer --- utils/librespeed-cli-rust/Makefile | 5 +++-- utils/librespeed-common/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/librespeed-cli-rust/Makefile b/utils/librespeed-cli-rust/Makefile index 45ae1f9f92..a7502d009a 100644 --- a/utils/librespeed-cli-rust/Makefile +++ b/utils/librespeed-cli-rust/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librespeed-cli-rust PKG_VERSION:=1.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/librespeed/speedtest-cli-rust/tar.gz/refs/tags/v$(PKG_VERSION)? @@ -32,8 +32,9 @@ define Package/librespeed-cli-rust TITLE:=Command line client for LibreSpeed (Rust) URL:=https://github.com/librespeed/speedtest-cli-rust DEPENDS:=$(RUST_ARCH_DEPENDS) +libopenssl - PROVIDES:=librespeed-cli + PROVIDES:=@librespeed-cli CONFLICTS:=librespeed-cli + DEFAULT_VARIANT:=1 endef define Package/librespeed-cli-rust/description diff --git a/utils/librespeed-common/Makefile b/utils/librespeed-common/Makefile index 974582e481..678644cf81 100644 --- a/utils/librespeed-common/Makefile +++ b/utils/librespeed-common/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librespeed-common PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=GPL-2.0-only @@ -21,7 +21,7 @@ define Package/librespeed-common SECTION:=utils CATEGORY:=Utilities TITLE:=LibreSpeed measurement orchestration - DEPENDS:=+librespeed-cli +rpcd-mod-ucode +jsonfilter +ucode +ucode-mod-fs \ + DEPENDS:=librespeed-cli +rpcd-mod-ucode +jsonfilter +ucode +ucode-mod-fs \ +ucode-mod-uci +jshn PKGARCH:=all endef