[openwrt/openwrt] build: restore opkg-related provides logic

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 5 14:49:45 PST 2026


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-25.12:
https://git.openwrt.org/d76c64ad00c7e424f23deb05518827dc5fd20875

commit d76c64ad00c7e424f23deb05518827dc5fd20875
Author: George Sapkin <george at sapk.in>
AuthorDate: Mon Jan 5 16:26:47 2026 +0200

    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 <george at sapk.in>
    Link: https://github.com/openwrt/openwrt/pull/21409
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit 838a9ff1ca3ab3a269592b5f899280169e76bde4)
---
 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 15c06fab0b..0c01112b27 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))




More information about the lede-commits mailing list