diff options
| author | George Sapkin | 2026-01-02 14:26:40 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-01-16 16:12:59 +0000 |
| commit | 6543c6800bfb6047397abe0968f05c8d86f77397 (patch) | |
| tree | 69b5b3812f64fa185f90485cdcf571ce77aeefc8 | |
| parent | 953ef126899c85da584601b6299b314d72686d4d (diff) | |
| download | openwrt-6543c6800bfb6047397abe0968f05c8d86f77397.tar.gz | |
uclient: provide virtual wget-any
Packages shouldn't provide a package that another package, in this case
wget from packages provides. Explicitly provide a virtual @wget-any
instead to match the implicit wget provide and switch the only consumer
to use the new provider.
Set uclient-fetch as the default variant for wget-any.
Signed-off-by: George Sapkin <george@sapk.in>
Link: https://github.com/openwrt/openwrt/pull/21369
(cherry picked from commit af1fa176c31368e5e56c5a1f31d8a12273536378)
Link: https://github.com/openwrt/openwrt/pull/21547
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | package/libs/uclient/Makefile | 5 | ||||
| -rw-r--r-- | package/system/apk/Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/package/libs/uclient/Makefile b/package/libs/uclient/Makefile index 6d73916b3e..7d1ff4fdd3 100644 --- a/package/libs/uclient/Makefile +++ b/package/libs/uclient/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uclient -PKG_RELEASE=1 +PKG_RELEASE=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uclient.git @@ -34,7 +34,8 @@ define Package/uclient-fetch CATEGORY:=Network TITLE:=Tiny wget replacement using libuclient ALTERNATIVES:=200:/usr/bin/wget:/bin/uclient-fetch - PROVIDES:=wget + DEFAULT_VARIANT:=1 + PROVIDES:=@wget-any DEPENDS:=+libuclient endef diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 25a2b0a9a2..130cff233b 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apk -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git @@ -26,7 +26,7 @@ define Package/apk/default SECTION:=base CATEGORY:=Base system TITLE:=apk package manager - DEPENDS:=+zlib +wget + DEPENDS:=+zlib +wget-any URL:=$(PKG_SOURCE_URL) PROVIDES:=apk endef |