[package] mac80211: cleanup patches

[openwrt.git] / package / iw / Makefile

diff --git a/package/iw/Makefile b/package/iw/Makefile
index 36361fb..1916d8d 100644 (file)
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -1,23 +1,19 @@
-# 
-# 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.
 #
 #
 # 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
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iw

-PKG_REV:=11b24c28b802bae2abda8f46d457df60fa602594
-PKG_VERSION:=20071130_$(PKG_REV)
+PKG_VERSION:=0.9.12

 PKG_RELEASE:=1
 
 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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/
+PKG_MD5SUM:=2aa919ff927dd9def151a87badfa111a

 PKG_BUILD_DEPENDS:=mac80211 libnl
 
 include $(INCLUDE_DIR)/package.mk
 PKG_BUILD_DEPENDS:=mac80211 libnl
 
 include $(INCLUDE_DIR)/package.mk


@@ -26,21 +22,23 @@ define Package/iw
   SECTION:=net
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
   SECTION:=net
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility

-  URL:=http://git.sipsolutions.net/?p=iw.git
+  URL:=http://wireless.kernel.org/en/users/Documentation/iw

   DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl
 endef
 
 define Build/Configure
   DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl
 endef
 
 define Build/Configure

-       $(CP) $(PKG_BUILD_DIR)/defconfig $(PKG_BUILD_DIR)/.config
+       echo "#define IW_VERSION \"$(PKG_VERSION)\"" > $(PKG_BUILD_DIR)/version.h

 endef
 
 MAKE_FLAGS += \
 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"
+       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS) -lnl"

 
 

-define Package/iw/install
+ifneq ($(CONFIG_LINUX_2_6),)
+  define Package/iw/install

        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/

-endef
+  endef
+endif

 
 $(eval $(call BuildPackage,iw))
 
 $(eval $(call BuildPackage,iw))