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 <pepe.schlehofer@gmail.com>

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

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 <pepe.schlehofer@gmail.com>
 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