From 838a9ff1ca3ab3a269592b5f899280169e76bde4 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 5 Jan 2026 16:26:47 +0200 Subject: [PATCH] build: restore opkg-related provides logic Re-add opkg provides logic to CONTROL when USE_APK is not set and remove virtual provider prefix. Fixes: cefbf11 ("build: refactor provides logic") Fixes: https://github.com/openwrt/openwrt/issues/21372 Fixes: https://github.com/openwrt/openwrt/issues/21382 Fixes: https://github.com/openwrt/openwrt/issues/21402 Signed-off-by: George Sapkin Link: https://github.com/openwrt/openwrt/pull/21409 Signed-off-by: Hauke Mehrtens --- include/package-pack.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/package-pack.mk b/include/package-pack.mk index 15c06fab0bc..0c01112b27d 100644 --- a/include/package-pack.mk +++ b/include/package-pack.mk @@ -324,7 +324,12 @@ endif Package/$(1)/DEPENDS := $$(call mergelist,$$(Package/$(1)/DEPENDS)) endif - Package/$(1)/PROVIDES := $$(call FormatProvides,$(1),$(VERSION),$(PROVIDES),$(ALTERNATIVES)) + ifeq ($(CONFIG_USE_APK),) + Package/$(1)/PROVIDES := $$(patsubst @%,%,$(PROVIDES)) + Package/$(1)/PROVIDES := $$(filter-out $(1)$$(ABIV_$(1)),$$(Package/$(1)/PROVIDES)$$(if $$(ABIV_$(1)), $(1) $$(foreach provide,$$(Package/$(1)/PROVIDES),$$(provide)$$(ABIV_$(1))))) + else + Package/$(1)/PROVIDES := $$(call FormatProvides,$(1),$(VERSION),$(PROVIDES),$(ALTERNATIVES)) + endif $(_define) Package/$(1)/CONTROL Package: $(1)$$(ABIV_$(1)) -- 2.47.3