fix hostap menuconfig and build for linux 2.6

[openwrt.git] / package / hostap-utils / Makefile

diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index 37be5d1..d1f7914 100644 (file)
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -1,11 +1,16 @@
+# Copyright (C) 2006 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:=hostap-utils
-PKG_VERSION:=0.4.0
+PKG_VERSION:=0.4.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=c6775ca98721affeb336392def22289e
+PKG_MD5SUM:=afe041581b8f01666e353bec20917c85
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -14,32 +19,33 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(eval $(call PKG_template,HOSTAP_UTILS,hostap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/hostap-utils
+  SECTION:=utils
+  CATEGORY:=Drivers
+  DEPENDS:=kmod-hostap
+  TITLE:=Host AP driver utility programs
+  DESCRIPTION:=Host AP driver utility programs
+  URL:=http://hostap.epitest.fi/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-       touch $@
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -Wall" \
                all
-       touch $@
-
-$(IPKG_HOSTAP_UTILS):
-       install -m0755 -d $(IDIR_HOSTAP_UTILS)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/hostap_crypt_conf $(IDIR_HOSTAP_UTILS)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/hostap_diag $(IDIR_HOSTAP_UTILS)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/hostap_io_debug $(IDIR_HOSTAP_UTILS)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/hostap_rid $(IDIR_HOSTAP_UTILS)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/prism2_srec $(IDIR_HOSTAP_UTILS)/usr/sbin/
-       install -m0755 $(PKG_BUILD_DIR)/split_combined_hex $(IDIR_HOSTAP_UTILS)/usr/sbin/
-       $(RSTRIP) $(IDIR_HOSTAP_UTILS)
-       $(IPKG_BUILD) $(IDIR_HOSTAP_UTILS) $(PACKAGE_DIR)
-
-mostlyclean:
-       -$(MAKE) -C $(PKG_BUILD_DIR) clean
-       rm -f $(PKG_BUILD_DIR)/.built
-
+endef
+
+define Package/hostap-utils/install    
+       install -m0755 -d $(1)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/hostap_crypt_conf $(1)/usr/sbin/
+       install -m0755 $(PKG_BUILD_DIR)/hostap_diag $(1)/usr/sbin/
+       install -m0755 $(PKG_BUILD_DIR)/hostap_io_debug $(1)/usr/sbin/
+       install -m0755 $(PKG_BUILD_DIR)/hostap_rid $(1)/usr/sbin/
+       install -m0755 $(PKG_BUILD_DIR)/prism2_srec $(1)/usr/sbin/
+       install -m0755 $(PKG_BUILD_DIR)/split_combined_hex $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,hostap-utils))