From 47f617ef8d44e4d7428ff3e0b42acb4a75f5cd37 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 14 Jun 2021 14:58:37 +0200 Subject: build: prepend ABI suffixes with a dash if package name ends with digit Ensure that ABI suffixes are separated with a dash from the package name if the name happens to end with a digit. This implementation detail got lost during the recent refactoring of the ABI_VERSION handling in buildroot. Ref: https://github.com/openwrt/packages/pull/14237#issuecomment-860473585 Fixes: c921650382 ("build: drop ABI version from metadata") Signed-off-by: Jo-Philipp Wich (cherry picked from commit f6a03bff5bccdbf9165087bccbb35095903d05c6) --- include/package-ipkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/package-ipkg.mk') diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index c2017cd220..e972b7de0b 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -99,7 +99,7 @@ _endef=endef ifeq ($(DUMP),) define BuildTarget/ipkg - ABIV_$(1):=$(if $(filter-out kmod-%,$(1)),$(ABI_VERSION)) + ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION)) PDIR_$(1):=$(call FeedPackageDir,$(1)) IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1) -- cgit v1.2.3