rt2800pci: add back ifdown hang workaround that was accidentally dropped during a...

[openwrt.git] / package / iw / Makefile

diff --git a/package/iw/Makefile b/package/iw/Makefile
index 1118df8..3aa2a06 100644 (file)
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -1,24 +1,20 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iw
-PKG_REV:=4d3a72da3f21761bf4f2866a6a3400d4ecf67365
-PKG_VERSION:=20080414_$(PKG_REV)
+PKG_VERSION:=0.9.20
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://git.sipsolutions.net/iw.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/
+PKG_MD5SUM:=1055799b544b3e08169d155bb6c21bb0
+PKG_BUILD_DEPENDS:=mac80211
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,23 +22,35 @@ define Package/iw
   SECTION:=net
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
-  URL:=http://git.sipsolutions.net/?p=iw.git
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl
+  URL:=http://wireless.kernel.org/en/users/Documentation/iw
+  DEPENDS:= +libnl-tiny @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
 endef
 
 define Build/Configure
-       $(CP) $(PKG_BUILD_DIR)/defconfig $(PKG_BUILD_DIR)/.config
+       echo "const char iw_version[] = \"$(PKG_VERSION)\";" > $(PKG_BUILD_DIR)/version.c
+       rm -f $(PKG_BUILD_DIR)/version.sh
+       touch $(PKG_BUILD_DIR)/version.sh
+       chmod +x $(PKG_BUILD_DIR)/version.sh
 endef
 
-MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl -I$(STAGING_DIR)/usr/include" \
-       LDFLAGS="-L$(STAGING_DIR)/usr/lib -lnl"
+TARGET_CPPFLAGS:= \
+       -I$(STAGING_DIR)/usr/include/libnl-tiny \
+       -I$(STAGING_DIR)/usr/include/mac80211 \
+       $(TARGET_CPPFLAGS) \
+       -DCONFIG_LIBNL20 \
+       -D_GNU_SOURCE
 
-ifneq ($(CONFIG_LINUX_2_6_23),)
-  define Package/iw/install
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS)" \
+       NL1FOUND="" NL2FOUND=Y \
+       NLLIBNAME="libnl-tiny" \
+       LIBS="-lm -lnl-tiny" \
+       V=1
+
+define Package/iw/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/
-  endef
-endif
+endef
 
 $(eval $(call BuildPackage,iw))