[openwrt/openwrt] build: prepend ABI suffixes with a dash if package name ends with digit

[LEDE Commits]

jow pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/47f617ef8d44e4d7428ff3e0b42acb4a75f5cd37

commit 47f617ef8d44e4d7428ff3e0b42acb4a75f5cd37
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Mon Jun 14 14:58:37 2021 +0200

    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 <jo at mein.io>
    (cherry picked from commit f6a03bff5bccdbf9165087bccbb35095903d05c6)
---
 include/feeds.mk        | 8 +++++++-
 include/package-ipkg.mk | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/feeds.mk b/include/feeds.mk
index 98e315bceb..e499ac2684 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -43,5 +43,11 @@ endef
 
 # 1: package name
 define GetABISuffix
-$(if $(filter-out kmod-%,$(1)),$(if $(ABIV_$(1)),$(ABIV_$(1)),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v)))))
+$(call FormatABISuffix,$(1),$(if $(ABIV_$(1)),$(ABIV_$(1)),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v)))))
+endef
+
+# 1: package name
+# 2: abi version
+define FormatABISuffix
+$(if $(filter-out kmod-%,$(1)),$(if $(2),$(if $(filter %0 %1 %2 %3 %4 %5 %6 %7 %8 %9,$(1)),-)$(2)))
 endef
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)