[openwrt/openwrt] build: fix getting ABI version for binary packages from the same source package

LEDE Commits lede-commits at lists.infradead.org
Mon Feb 15 17:12:04 EST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7d6a636918bccf68b49324729759e7c569105f71

commit 7d6a636918bccf68b49324729759e7c569105f71
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Feb 15 23:09:53 2021 +0100

    build: fix getting ABI version for binary packages from the same source package
    
    We can't rely on the .version file being created yet, so use package variables
    to get it
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/feeds.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/feeds.mk b/include/feeds.mk
index 5676cc4a8f..98e315bceb 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -43,5 +43,5 @@ endef
 
 # 1: package name
 define GetABISuffix
-$(if $(filter-out kmod-%,$(1)),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v))))
+$(if $(filter-out kmod-%,$(1)),$(if $(ABIV_$(1)),$(ABIV_$(1)),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v)))))
 endef



More information about the lede-commits mailing list