mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2026-06-11 04:27:27 -04:00
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 af1fa176c3)
Link: https://github.com/openwrt/openwrt/pull/21547
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
committed by
Robert Marko
parent
953ef12689
commit
6543c6800b
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user