iwinfo: improve ABI version handling and bump to git HEAD

[openwrt/staging/rmilecki.git] / package / network / utils / iwinfo / Makefile

diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
index 4a8d935492650abdd3e12af14fa75ff34009f00e..cb54fa39121a0ecf517209937d0117925af400d0 100644 (file)
--- a/package/network/utils/iwinfo/Makefile
+++ b/package/network/utils/iwinfo/Makefile
@@ -11,9 +11,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
-PKG_SOURCE_DATE:=2019-10-15
-PKG_SOURCE_VERSION:=a29b7d4e26a8d97e48c2a899dda3665d385b95db
-PKG_MIRROR_HASH:=5dc8578a023ab95b81c3d1c9e1968a3a23e57ad7c712fea06a3ed4e1eee4de17
+PKG_SOURCE_DATE:=2021-01-06
+PKG_SOURCE_VERSION:=23d2722b1251f1aba9355bba23e17596f93adb65
+PKG_MIRROR_HASH:=9e6fe4a206860c7ca73a70841bce2791b697197098efe86726ad4d5d1c3ce468
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
 
@@ -25,6 +25,8 @@ PKG_CONFIG_DEPENDS := \
        CONFIG_PACKAGE_kmod-brcm-wl-mimo \
        CONFIG_PACKAGE_kmod-cfg80211
 
+IWINFO_ABI_VERSION:=20210106
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -33,7 +35,7 @@ define Package/libiwinfo
   CATEGORY:=Libraries
   TITLE:=Generalized Wireless Information Library (iwinfo)
   DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny +libuci +libubus
-  ABI_VERSION:=20181126
+  ABI_VERSION:=$(IWINFO_ABI_VERSION)
 endef
 
 define Package/libiwinfo/description
@@ -86,21 +88,22 @@ MAKE_FLAGS += \
        FPIC="$(FPIC)" \
        CFLAGS="$(TARGET_CFLAGS)" \
        LDFLAGS="$(TARGET_LDFLAGS)" \
-       BACKENDS="$(IWINFO_BACKENDS)"
+       BACKENDS="$(IWINFO_BACKENDS)" \
+       SOVERSION="$(IWINFO_ABI_VERSION)"
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/iwinfo
        $(CP) $(PKG_BUILD_DIR)/include/iwinfo.h $(1)/usr/include/
        $(CP) $(PKG_BUILD_DIR)/include/iwinfo/* $(1)/usr/include/iwinfo/
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
+       $(CP) $(PKG_BUILD_DIR)/libiwinfo.so* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/lib/lua
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
 endef
 
 define Package/libiwinfo/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so.$(IWINFO_ABI_VERSION) $(1)/usr/lib/libiwinfo.so.$(IWINFO_ABI_VERSION)
        $(INSTALL_DIR) $(1)/usr/share/libiwinfo
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/hardware.txt $(1)/usr/share/libiwinfo/hardware.txt
 endef