From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 15 Feb 2021 22:09:53 +0000 (+0100)
Subject: build: fix getting ABI version for binary packages from the same source package
X-Git-Tag: v21.02.0-rc1~236
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7d6a636918bccf68b49324729759e7c569105f71;p=openwrt%2Fopenwrt.git

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@nbd.name>
---

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