iwinfo: fix nl80211 phy lookup without platform prefix

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

diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
index 8b103ebb57fd64ab8488ffa6070d07291aea18a6..3049e243b1c966c68f595527642c6812228f92bd 100644 (file)
--- a/package/network/utils/iwinfo/Makefile
+++ b/package/network/utils/iwinfo/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+# Copyright (C) 2010-2016 Jo-Philipp Wich <jo@mein.io>
 #
 # This is free software, licensed under the GPL 2 license.
 #
@@ -7,15 +7,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo
-PKG_RELEASE:=41
+PKG_VERSION:=2016-07-04
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=$(LEDE_GIT)/project/iwinfo.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=96d322d5941c57be58f8e8d5c6e2b28e90ed3598
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
+PKG_LICENSE:=GPL-2.0
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_CONFIG_DEPENDS := \
        CONFIG_PACKAGE_kmod-brcm-wl \
        CONFIG_PACKAGE_kmod-brcm-wl-mini \
        CONFIG_PACKAGE_kmod-brcm-wl-mimo \
        CONFIG_PACKAGE_kmod-madwifi \
-       CONFIG_PACKAGE_kmod-mac80211
+       CONFIG_PACKAGE_kmod-cfg80211
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,8 +32,8 @@ define Package/libiwinfo
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Generalized Wireless Information Library (iwinfo)
-  DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny
-  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny +libuci
+  ABI_VERSION:=$(PKG_RELEASE)
 endef
 
 define Package/libiwinfo/description
@@ -40,7 +48,6 @@ define Package/libiwinfo-lua
   CATEGORY:=Languages
   TITLE:=libiwinfo Lua binding
   DEPENDS:=+libiwinfo +liblua
-  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 endef
 
 define Package/libiwinfo-lua/description
@@ -54,7 +61,6 @@ define Package/iwinfo
   CATEGORY:=Utilities
   TITLE:=Generalized Wireless Information utility
   DEPENDS:=+libiwinfo
-  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 endef
 
 define Package/iwinfo/description
@@ -62,11 +68,6 @@ define Package/iwinfo/description
 endef
 
 
-define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
-       $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
 define Build/Configure
 endef
 
@@ -75,7 +76,7 @@ IWINFO_BACKENDS := \
        $(if $(CONFIG_PACKAGE_kmod-brcm-wl-mini),wl) \
        $(if $(CONFIG_PACKAGE_kmod-brcm-wl-mimo),wl) \
        $(if $(CONFIG_PACKAGE_kmod-madwifi),madwifi) \
-       $(if $(CONFIG_PACKAGE_kmod-mac80211),nl80211)
+       $(if $(CONFIG_PACKAGE_kmod-cfg80211),nl80211)
 
 TARGET_CFLAGS += \
        -I$(STAGING_DIR)/usr/include/libnl-tiny \
@@ -101,6 +102,8 @@ endef
 define Package/libiwinfo/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
+       $(INSTALL_DIR) $(1)/usr/share/libiwinfo
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/hardware.txt $(1)/usr/share/libiwinfo/hardware.txt
 endef
 
 define Package/libiwinfo-lua/install