Skip to content

Commit 838a9ff

Browse files
GeorgeSapkinhauke
authored andcommitted
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: openwrt/openwrt#21372 Fixes: openwrt/openwrt#21382 Fixes: openwrt/openwrt#21402 Signed-off-by: George Sapkin <george@sapk.in> Link: openwrt/openwrt#21409 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent bf46d11 commit 838a9ff

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

include/package-pack.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,12 @@ endif
324324
Package/$(1)/DEPENDS := $$(call mergelist,$$(Package/$(1)/DEPENDS))
325325
endif
326326

327-
Package/$(1)/PROVIDES := $$(call FormatProvides,$(1),$(VERSION),$(PROVIDES),$(ALTERNATIVES))
327+
ifeq ($(CONFIG_USE_APK),)
328+
Package/$(1)/PROVIDES := $$(patsubst @%,%,$(PROVIDES))
329+
Package/$(1)/PROVIDES := $$(filter-out $(1)$$(ABIV_$(1)),$$(Package/$(1)/PROVIDES)$$(if $$(ABIV_$(1)), $(1) $$(foreach provide,$$(Package/$(1)/PROVIDES),$$(provide)$$(ABIV_$(1)))))
330+
else
331+
Package/$(1)/PROVIDES := $$(call FormatProvides,$(1),$(VERSION),$(PROVIDES),$(ALTERNATIVES))
332+
endif
328333

329334
$(_define) Package/$(1)/CONTROL
330335
Package: $(1)$$(ABIV_$(1))

0 commit comments

Comments
 (0)